fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-29 06:32:16 +00:00
Code Issues Projects Releases Wiki Activity

make getaddrinfo with AF_UNSPEC and null host return both IPv4 and v6

Browse Source 
based on a patch by orc, with indexing and flow control cleaned up a
little bit. this code is all going to be replaced at some point in the
near future.
This commit is contained in:
Rich Felker
2013-07-24 16:49:17 -04:00
parent e152ee9778
commit f5dfb45f78
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/network/getaddrinfo.c
View File

@ -100,21 +100,30 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
} }
if (!host) { if (!host) {
if (family == AF_UNSPEC) family = AF_INET; if (family == AF_UNSPEC) {
buf = calloc(sizeof *buf, 1+EXTRA); cnt = 2; family = AF_INET;
} else {
cnt = 1;
}
buf = calloc(sizeof *buf, cnt);
if (!buf) return EAI_MEMORY; if (!buf) return EAI_MEMORY;
buf->ai.ai_protocol = proto; for (i=0; i<cnt; i++) {
buf->ai.ai_socktype = type; if (i) family = AF_INET6;
buf->ai.ai_addr = (void *)&buf->sa; buf[i].ai.ai_protocol = proto;
buf->ai.ai_addrlen = family==AF_INET6 ? sizeof sa.sin6 : sizeof sa.sin; buf[i].ai.ai_socktype = type;
buf->ai.ai_family = family; buf[i].ai.ai_addr = (void *)&buf[i].sa;
buf->sa.sin.sin_family = family; buf[i].ai.ai_addrlen = family==AF_INET6
buf->sa.sin.sin_port = port; ? sizeof sa.sin6 : sizeof sa.sin;
buf[i].ai.ai_family = family;
buf[i].sa.sin.sin_family = family;
buf[i].sa.sin.sin_port = port;
if (i+1<cnt) buf[i].ai.ai_next = &buf[i+1].ai;
if (!(flags & AI_PASSIVE)) { if (!(flags & AI_PASSIVE)) {
if (family == AF_INET) { if (family == AF_INET) {
0[(uint8_t*)&buf->sa.sin.sin_addr.s_addr]=127; 0[(uint8_t*)&buf[i].sa.sin.sin_addr.s_addr]=127;
3[(uint8_t*)&buf->sa.sin.sin_addr.s_addr]=1; 3[(uint8_t*)&buf[i].sa.sin.sin_addr.s_addr]=1;
} else buf[0].sa.sin6.sin6_addr.s6_addr[15] = 1; } else buf[i].sa.sin6.sin6_addr.s6_addr[15] = 1;
}
} }
*res = &buf->ai; *res = &buf->ai;
return 0; return 0;