X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fnetwork%2Fgetifaddrs.c;h=a14ac1b3232184a704c2ae180fd9b6a983a0194c;hp=730ce8d1be5c9c3a064005007ea8df62913b1a38;hb=HEAD;hpb=4af3ea789ac466493634a32235c77bb11f078fe6

diff --git a/src/network/getifaddrs.c b/src/network/getifaddrs.c
index 730ce8d1..a14ac1b3 100644
--- a/src/network/getifaddrs.c
+++ b/src/network/getifaddrs.c
@@ -36,7 +36,6 @@ static stor* list_add(stor** list, stor** head, char* ifname)
 		*head = curr;
 		if(!*list) *list = curr;
 	}
-	out:
 	return curr;
 }
 
@@ -52,8 +51,17 @@ void freeifaddrs(struct ifaddrs *ifp)
 
 static void ipv6netmask(unsigned prefix_length, struct sockaddr_in6 *sa)
 {
-	// FIXME: left for bit-wizard rich
-	memset(&sa->sin6_addr, -1, sizeof(sa->sin6_addr));
+	unsigned char* hb = sa->sin6_addr.s6_addr;
+	unsigned onebytes = prefix_length / 8;
+	unsigned bits = prefix_length % 8;
+	unsigned nullbytes = 16 - onebytes;
+	memset(hb, -1, onebytes);
+	memset(hb+onebytes, 0, nullbytes);
+	if(bits) {
+		unsigned char x = -1;
+		x <<= 8 - bits;
+		hb[onebytes] = x;
+	}
 }
 
 static void dealwithipv6(stor **list, stor** head)
@@ -119,7 +127,7 @@ int getifaddrs(struct ifaddrs **ifap)
 	}
 	if_freenameindex(ii);
 
-	int sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+	int sock = socket(PF_INET, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_IP);
 	if(sock == -1) goto err2;
 	struct ifreq reqs[32]; /* arbitrary chosen boundary */
 	struct ifconf conf = {.ifc_len = sizeof reqs, .ifc_req = reqs};