status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

upnpevents.c: properly enclose IPv6 address in [] 

in the HOST: header of NOTIFY http requests
This commit is contained in:
Thomas Bernard 2016-02-19 12:38:32 +01:00
parent 19ee0577e3
commit fd82e4c2d9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
miniupnpd/upnpevents.c
View File

@ -318,12 +318,15 @@ upnp_event_notify_connect(struct upnp_event_notify * obj)
p += 7; /* http:// */ p += 7; /* http:// */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(*p == '[') { /* ip v6 */ if(*p == '[') { /* ip v6 */
obj->addrstr[i++] = '[';
p++; p++;
obj->ipv6 = 1; obj->ipv6 = 1;
while(*p != ']' && i < (sizeof(obj->addrstr)-1)) while(*p != ']' && i < (sizeof(obj->addrstr)-1))
obj->addrstr[i++] = *(p++); obj->addrstr[i++] = *(p++);
if(*p == ']') if(*p == ']')
p++; p++;
if(i < (sizeof(obj->addrstr)-1))
obj->addrstr[i++] = ']';
} else { } else {
#endif #endif
while(*p != '/' && *p != ':' && i < (sizeof(obj->addrstr)-1)) while(*p != '/' && *p != ':' && i < (sizeof(obj->addrstr)-1))
@ -349,9 +352,16 @@ upnp_event_notify_connect(struct upnp_event_notify * obj)
obj->path = p; obj->path = p;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(obj->ipv6) { if(obj->ipv6) {
char addrstr_tmp[48];
struct sockaddr_in6 * sa = (struct sockaddr_in6 *)&addr; struct sockaddr_in6 * sa = (struct sockaddr_in6 *)&addr;
sa->sin6_family = AF_INET6; sa->sin6_family = AF_INET6;
inet_pton(AF_INET6, obj->addrstr, &(sa->sin6_addr)); i = (int)strlen(obj->addrstr);
if(i > 2) {
i -= 2;
memcpy(addrstr_tmp, obj->addrstr + 1, i);
addrstr_tmp[i] = '\0';
inet_pton(AF_INET6, addrstr_tmp, &(sa->sin6_addr));
}
sa->sin6_port = htons(port); sa->sin6_port = htons(port);
addrlen = sizeof(struct sockaddr_in6); addrlen = sizeof(struct sockaddr_in6);
} else { } else {