diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/network.c | 4 | ||||
| -rw-r--r-- | main/php_network.h | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/main/network.c b/main/network.c index 597bcb6901..5b23a09313 100644 --- a/main/network.c +++ b/main/network.c @@ -204,7 +204,7 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal) /* {{{ 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 @@ ok: * 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; diff --git a/main/php_network.h b/main/php_network.h index d244160335..d95b72dd47 100644 --- a/main/php_network.h +++ b/main/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 */ |