php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add IPv6 support to stream_socket_client/server()

Browse Source
This commit is contained in:
Sara Golemon
2003-04-05 02:42:12 +00:00
parent b01169b63d
commit d6c24de842
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/streams/xp_socket.c
View File

@@ -380,9 +380,24 @@ static inline int parse_unix_address(php_stream_xport_param *xparam, struct sock
static inline char *parse_ip_address(php_stream_xport_param *xparam, int *portno TSRMLS_DC)
{
char *colon;
char *host = NULL;
char *p, *host = NULL;
colon = memchr(xparam->inputs.name, ':', xparam->inputs.namelen);
#ifdef HAVE_IPV6
if (*(xparam->inputs.name) == '[') {
/* IPV6 notation to specify raw address with port (i.e. [fe80::1]:80) */
p = memchr(xparam->inputs.name + 1, ']', xparam->inputs.namelen - 2);
if (!p || *(p + 1) != ':') {
if (xparam->want_errortext) {
spprintf(&xparam->outputs.error_text, 0, "Failed to parse IPv6 address \"%s\"", xparam->inputs.name);
}
return NULL;
}
*portno = atoi(p + 2);
return estrndup(xparam->inputs.name + 1, p - xparam->inputs.name - 1);
}
#endif
colon = memchr(xparam->inputs.name, ':', xparam->inputs.namelen - 1);
if (colon) {
*portno = atoi(colon + 1);
host = estrndup(xparam->inputs.name, colon - xparam->inputs.name);