MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

evhttp: Handle IPv6 scoped addresses

This commit is contained in:
Julien BLACHE 2011-03-10 20:28:08 +01:00
parent 09a981807b
commit 2f2582800e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/evhttp/http.c
View File

@ -1700,21 +1700,37 @@ struct evhttp_connection *
evhttp_connection_new(const char *address, unsigned short port)
{
struct evhttp_connection *evcon = NULL;
char *intf;
char *addr;
unsigned char scratch[16];
int family;
if (inet_pton(AF_INET6, address, scratch) == 1)
if ((addr = strdup(address)) == NULL) {
event_warn("%s: strdup failed", __func__);
goto error;
}
intf = strchr(addr, '%');
if (intf)
*intf = '\0';
if (inet_pton(AF_INET6, addr, scratch) == 1)
family = AF_INET6;
else if (inet_pton(AF_INET, address, scratch) == 1)
else if (inet_pton(AF_INET, addr, scratch) == 1)
family = AF_INET;
else {
free(addr);
event_warn("%s: address is neither IPv6 nor IPv4", __func__);
return NULL;
}
if (intf)
*intf = '%';
event_debug(("Attempting connection to %s:%d\n", address, port));
if ((evcon = calloc(1, sizeof(struct evhttp_connection))) == NULL) {
free(addr);
event_warn("%s: calloc failed", __func__);
goto error;
}
@ -1727,10 +1743,7 @@ evhttp_connection_new(const char *address, unsigned short port)
evcon->family = family;
if ((evcon->address = strdup(address)) == NULL) {
event_warn("%s: strdup failed", __func__);
goto error;
}
evcon->address = addr;
if ((evcon->input_buffer = evbuffer_new()) == NULL) {
event_warn("%s: evbuffer_new failed", __func__);