cvs: php4 / configure.in /ext/sockets php_sockets.h sockets.c /main network.c php_network.h

venaas Sun Jan 6 06:54:19 2002 EDT Modified files: /php4 configure.in /php4/main php_network.h network.c /php4/ext/sockets php_sockets.h sockets.c Log: Added some consts for arguments in network.c declarations. Moved php_sockaddr_storage to php_network.h and added check for struct sockaddr_storage Index: php4/configure.in diff -u php4/configure.in:1.285 php4/configure.in:1.286 --- php4/configure.in:1.285 Fri Jan 4 10:00:26 2002 +++ php4/configure.in Sun Jan 6 06:54:18 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.285 2002/01/04 15:00:26 hholzgra Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.286 2002/01/06 11:54:18 venaas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -351,6 +351,15 @@ dnl Checks for types AC_TYPE_SIZE_T AC_TYPE_UID_T + +dnl Check for struct sockaddr_storage +AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage, +[AC_TRY_COMPILE([ #include <sys/types.h> +#include <sys/socket.h>], [struct sockaddr_storage s; s], + ac_cv_sockaddr_storage=yes, ac_cv_sockaddr_storage=no)]) +if test "$ac_cv_sockaddr_storage" = yes; then + AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage]) +fi dnl Check for IPv6 support AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.8 php4/main/php_network.h:1.9 --- php4/main/php_network.h:1.8 Tue Dec 11 10:31:04 2001 +++ php4/main/php_network.h Sun Jan 6 06:54:19 2002 @@ -15,7 +15,7 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.8 2001/12/11 15:31:04 sebastian Exp $ */ +/* $Id: php_network.h,v 1.9 2002/01/06 11:54:19 venaas Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -41,10 +41,18 @@ #include <sys/time.h> #endif +#ifdef HAVE_SOCKADDR_STORAGE +typedef struct sockaddr_storage php_sockaddr_storage; +#else +typedef struct { + unsigned short ss_family; + char info[256]; +} php_sockaddr_storage; +#endif -int php_hostconnect(char *host, unsigned short port, int socktype, int timeout); -PHPAPI int php_connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout); +int php_hostconnect(const char *host, unsigned short port, int socktype, int timeout); +PHPAPI int php_connect_nonb(int sockfd, const struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout); #endif /* _PHP_NETWORK_H */ Index: php4/main/network.c diff -u php4/main/network.c:1.24 php4/main/network.c:1.25 --- php4/main/network.c:1.24 Sat Dec 22 19:46:13 2001 +++ php4/main/network.c Sun Jan 6 06:54:19 2002 @@ -15,7 +15,7 @@ | Authors: Stig Venaas <venaas@uninett.no> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.24 2001/12/23 00:46:13 alexwaugh Exp $ */ +/* $Id: network.c,v 1.25 2002/01/06 11:54:19 venaas Exp $ */ #include "php.h" @@ -204,7 +204,7 @@ /* {{{ php_connect_nonb */ PHPAPI int php_connect_nonb(int sockfd, - struct sockaddr *addr, + const struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout) { @@ -284,7 +284,7 @@ * port, returns the created socket on success, else returns -1. * timeout gives timeout in seconds, 0 means blocking mode. */ -int php_hostconnect(char *host, unsigned short port, int socktype, int timeout) +int php_hostconnect(const char *host, unsigned short port, int socktype, int timeout) { int s; struct sockaddr **sal, **psal; Index: php4/ext/sockets/php_sockets.h diff -u php4/ext/sockets/php_sockets.h:1.19 php4/ext/sockets/php_sockets.h:1.20 --- php4/ext/sockets/php_sockets.h:1.19 Tue Dec 11 10:30:24 2001 +++ php4/ext/sockets/php_sockets.h Sun Jan 6 06:54:19 2002 @@ -22,7 +22,7 @@ #ifndef PHP_SOCKETS_H #define PHP_SOCKETS_H -/* $Id: php_sockets.h,v 1.19 2001/12/11 15:30:24 sebastian Exp $ */ +/* $Id: php_sockets.h,v 1.20 2002/01/06 11:54:19 venaas Exp $ */ #if HAVE_SOCKETS @@ -101,11 +101,6 @@ fd_set set; SOCKET max_fd; } php_fd_set; - -typedef struct { - long family; - char info[256]; -} php_sockaddr_storage; typedef struct { zend_bool use_system_read; Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.84 php4/ext/sockets/sockets.c:1.85 --- php4/ext/sockets/sockets.c:1.84 Fri Dec 14 00:58:28 2001 +++ php4/ext/sockets/sockets.c Sun Jan 6 06:54:19 2002 @@ -19,13 +19,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.84 2001/12/14 05:58:28 jason Exp $ */ +/* $Id: sockets.c,v 1.85 2002/01/06 11:54:19 venaas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "php.h" +#include "php_network.h" #if HAVE_SOCKETS