nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #89 from yuvalt/master

Browse Source 
Fix situation where ipv6 address is actually ipv4 address
This commit is contained in:
Albert Zeyer
2011-05-29 14:51:22 -07:00
parent 90d03a1b47 272c288dfe
commit f8c49423df
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shairport.c
+18 -2
View File
@@ -329,8 +329,24 @@ void handleClient(int pSock, char *pPassword, char *pHWADDR)
struct sockaddr_in6 *s = (struct sockaddr_in6 *)&addr;
port = ntohs(s->sin6_port);
inet_ntop(AF_INET6, &s->sin6_addr, ipstr, sizeof ipstr);
memcpy(ipbin, &s->sin6_addr, 16);
ipbinlen = 16;
#ifndef __APPLE__
#define __u6_addr __in6_u
#endif
if (s->sin6_addr.__u6_addr.__u6_addr32[0] == 0 &&
s->sin6_addr.__u6_addr.__u6_addr32[1] == 0 &&
s->sin6_addr.__u6_addr.__u6_addr32[2] == 0xffff0000)
{
// its ipv4...
memcpy(ipbin, &s->sin6_addr.__u6_addr.__u6_addr32[3], 4);
ipbinlen = 4;
}
else
{
memcpy(ipbin, &s->sin6_addr, 16);
ipbinlen = 16;
}
}
slog(LOG_DEBUG_V, "Peer IP address: %s\n", ipstr);