mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/maint-daemon-sans-ss-family'

Browse Source 
* bc/maint-daemon-sans-ss-family:
  daemon.c: avoid accessing ss_family member of struct sockaddr_storage
This commit is contained in:
Junio C Hamano
2010-04-03 12:28:39 -07:00
parent a59cb82a2f 3aff874af2
commit d718dd0732
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daemon.c
View File

@ -590,14 +590,17 @@ static int execute(struct sockaddr *addr)
static int addrcmp(const struct sockaddr_storage *s1, static int addrcmp(const struct sockaddr_storage *s1,
const struct sockaddr_storage *s2) const struct sockaddr_storage *s2)
{ {
if (s1->ss_family != s2->ss_family) const struct sockaddr *sa1 = (const struct sockaddr*) s1;
return s1->ss_family - s2->ss_family; const struct sockaddr *sa2 = (const struct sockaddr*) s2;
if (s1->ss_family == AF_INET)
if (sa1->sa_family != sa2->sa_family)
return sa1->sa_family - sa2->sa_family;
if (sa1->sa_family == AF_INET)
return memcmp(&((struct sockaddr_in *)s1)->sin_addr, return memcmp(&((struct sockaddr_in *)s1)->sin_addr,
&((struct sockaddr_in *)s2)->sin_addr, &((struct sockaddr_in *)s2)->sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
#ifndef NO_IPV6 #ifndef NO_IPV6
if (s1->ss_family == AF_INET6) if (sa1->sa_family == AF_INET6)
return memcmp(&((struct sockaddr_in6 *)s1)->sin6_addr, return memcmp(&((struct sockaddr_in6 *)s1)->sin6_addr,
&((struct sockaddr_in6 *)s2)->sin6_addr, &((struct sockaddr_in6 *)s2)->sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));