cvs: php4 /ext/standard fsock.c fsock.h

dbeu Tue Feb 20 12:34:14 2001 EDT Modified files: /php4/ext/standard fsock.c fsock.h Log: make socket functions available to the outside Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.62 php4/ext/standard/fsock.c:1.63 --- php4/ext/standard/fsock.c:1.62 Sun Feb 18 10:54:41 2001 +++ php4/ext/standard/fsock.c Tue Feb 20 12:34:13 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.62 2001/02/18 18:54:41 thies Exp $ */ +/* $Id: fsock.c,v 1.63 2001/02/20 20:34:13 dbeu Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -101,7 +101,7 @@ /* * Converts a host name to an IP address. */ -int lookup_hostname(const char *addr, struct in_addr *in) +PHPAPI int lookup_hostname(const char *addr, struct in_addr *in) { struct hostent *host_info; @@ -119,7 +119,7 @@ /* }}} */ /* {{{ php_is_persistent_sock */ -int php_is_persistent_sock(int sock) +PHPAPI int php_is_persistent_sock(int sock) { char *key; FLS_FETCH(); @@ -371,7 +371,7 @@ FG(phpsockbuf) = sock->next; \ pefree(sock, sock->persistent) -void php_cleanup_sockbuf(int persistent FLS_DC) +PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC) { php_sockbuf *now, *next; @@ -429,7 +429,7 @@ return sock; } -size_t php_sock_set_def_chunk_size(size_t size) +PHPAPI size_t php_sock_set_def_chunk_size(size_t size) { size_t old; FLS_FETCH(); @@ -442,7 +442,7 @@ return old; } -int php_sockdestroy(int socket) +PHPAPI int php_sockdestroy(int socket) { int ret = 0; php_sockbuf *sock; @@ -469,7 +469,7 @@ #define SOCK_CLOSE(s) shutdown(s, 0); closesocket(s) -int php_sock_close(int socket) +PHPAPI int php_sock_close(int socket) { int ret = 0; php_sockbuf *sock; @@ -579,7 +579,7 @@ return nr_read; } -int php_sockset_blocking(int socket, int mode) +PHPAPI int php_sockset_blocking(int socket, int mode) { int old; SOCK_FIND(sock, socket); @@ -591,7 +591,7 @@ return old; } -void php_sockset_timeout(int socket, struct timeval *timeout) +PHPAPI void php_sockset_timeout(int socket, struct timeval *timeout) { SOCK_FIND(sock, socket); @@ -606,7 +606,7 @@ /* * FIXME: fgets depends on '\n' as line delimiter */ -char *php_sock_fgets(char *buf, size_t maxlen, int socket) +PHPAPI char *php_sock_fgets(char *buf, size_t maxlen, int socket) { char *p = NULL; char *ret = NULL; @@ -665,7 +665,7 @@ * ss@2ns.de 19990528 */ -int php_sock_fgetc(int socket) +PHPAPI int php_sock_fgetc(int socket) { int ret = EOF; SOCK_FIND_AND_READ_MAX(1); @@ -678,7 +678,7 @@ return ret; } -int php_sock_feof(int socket) +PHPAPI int php_sock_feof(int socket) { int ret = 0; SOCK_FIND(sock, socket); @@ -694,7 +694,7 @@ /* {{{ php_sock_fread() */ -size_t php_sock_fread(char *ptr, size_t size, int socket) +PHPAPI size_t php_sock_fread(char *ptr, size_t size, int socket) { size_t ret = 0; SOCK_FIND_AND_READ_MAX(size); @@ -715,7 +715,7 @@ /* {{{ module start/shutdown functions */ /* {{{ php_msock_destroy */ -void php_msock_destroy(int *data) +PHPAPI void php_msock_destroy(int *data) { close(*data); } Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.31 php4/ext/standard/fsock.h:1.32 --- php4/ext/standard/fsock.h:1.31 Sat Jan 13 15:49:44 2001 +++ php4/ext/standard/fsock.h Tue Feb 20 12:34:14 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.31 2001/01/13 23:49:44 zeev Exp $ */ +/* $Id: fsock.h,v 1.32 2001/02/20 20:34:14 dbeu Exp $ */ /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */ @@ -70,19 +70,19 @@ PHP_FUNCTION(fsockopen); PHP_FUNCTION(pfsockopen); -int lookup_hostname(const char *addr, struct in_addr *in); -char *php_sock_fgets(char *buf, size_t maxlen, int socket); -size_t php_sock_fread(char *buf, size_t maxlen, int socket); -int php_sock_feof(int socket); -int php_sock_fgetc(int socket); -int php_is_persistent_sock(int); -int php_sockset_blocking(int socket, int mode); -void php_sockset_timeout(int socket, struct timeval *timeout); -int php_sockdestroy(int socket); -int php_sock_close(int socket); -size_t php_sock_set_def_chunk_size(size_t size); -void php_msock_destroy(int *data); -void php_cleanup_sockbuf(int persistent FLS_DC); +PHPAPI int lookup_hostname(const char *addr, struct in_addr *in); +PHPAPI char *php_sock_fgets(char *buf, size_t maxlen, int socket); +PHPAPI size_t php_sock_fread(char *buf, size_t maxlen, int socket); +PHPAPI int php_sock_feof(int socket); +PHPAPI int php_sock_fgetc(int socket); +PHPAPI int php_is_persistent_sock(int); +PHPAPI int php_sockset_blocking(int socket, int mode); +PHPAPI void php_sockset_timeout(int socket, struct timeval *timeout); +PHPAPI int php_sockdestroy(int socket); +PHPAPI int php_sock_close(int socket); +PHPAPI size_t php_sock_set_def_chunk_size(size_t size); +PHPAPI void php_msock_destroy(int *data); +PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC); PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout); PHPAPI struct php_sockbuf *php_get_socket(int socket);