# [PATCH] daemon: consider only address in kill_some_child() 2 messages from 2010-01-09 to 2010-01-09. Participants: Erik Faye-Lund, Junio C Hamano. Thread: https://gitlist.dev/t/22145 ## Erik Faye-Lund, 2010-01-09 14:13 Subject: [PATCH] daemon: consider only address in kill_some_child() Message-ID: <1263046408-2368-1-git-send-email-kusmabite@gmail.com> URL: https://gitlist.dev/e/1263046408-2368-1-git-send-email-kusmabite%40gmail.com ``` kill_some_child() compares the entire sockaddr_storage structure (with the pad-bits zeroed out) when trying to find out if connections originate from the same host. However, sockaddr_storage contains the port-number for the connection (which varies between connections), so the comparison always fails. Change the code so we only consider the host-address, by introducing the addrcmp()-function that inspects the address family and compare as appropriate. Signed-off-by: Erik Faye-Lund --- daemon.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/daemon.c b/daemon.c index 5783e24..918e560 100644 --- a/daemon.c +++ b/daemon.c @@ -562,6 +562,24 @@ static int execute(struct sockaddr *addr) return -1; } +static int addrcmp(const struct sockaddr_storage *s1, + const struct sockaddr_storage *s2) +{ + if (s1->ss_family != s2->ss_family) + return s1->ss_family - s2->ss_family; + if (s1->ss_family == AF_INET) + return memcmp(&((struct sockaddr_in *)s1)->sin_addr, + &((struct sockaddr_in *)s2)->sin_addr, + sizeof(struct in_addr)); +#ifndef NO_IPV6 + if (s1->ss_family == AF_INET6) + return memcmp(&((struct sockaddr_in6 *)s1)->sin6_addr, + &((struct sockaddr_in6 *)s2)->sin6_addr, + sizeof(struct in6_addr)); +#endif + return 0; +} + static int max_connections = 32; static unsigned int live_children; @@ -576,17 +594,12 @@ static void add_child(pid_t pid, struct sockaddr *addr, int addrlen) { struct child *newborn, **cradle; - /* - * This must be xcalloc() -- we'll compare the whole sockaddr_storage - * but individual address may be shorter. - */ newborn = xcalloc(1, sizeof(*newborn)); live_children++; newborn->pid = pid; memcpy(&newborn->address, addr, addrlen); for (cradle = &firstborn; *cradle; cradle = &(*cradle)->next) - if (!memcmp(&(*cradle)->address, &newborn->address, - sizeof(newborn->address))) + if (!addrcmp(&(*cradle)->address, &newborn->address)) break; newborn->next = *cradle; *cradle = newborn; @@ -619,8 +632,7 @@ static void kill_some_child(void) return; for (; (next = blanket->next); blanket = next) - if (!memcmp(&blanket->address, &next->address, - sizeof(next->address))) { + if (!addrcmp(&blanket->address, &next->address)) { kill(blanket->pid, SIGTERM); break; } -- 1.6.6.95.gae285 ``` ## Junio C Hamano, 2010-01-09 17:20 Subject: Re: [PATCH] daemon: consider only address in kill_some_child() Message-ID: <7vocl3ry9m.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vocl3ry9m.fsf%40alter.siamese.dyndns.org In-Reply-To: <1263046408-2368-1-git-send-email-kusmabite@gmail.com> ``` Erik Faye-Lund writes: > kill_some_child() compares the entire sockaddr_storage structure (with > the pad-bits zeroed out) when trying to find out if connections > originate from the same host. However, sockaddr_storage contains the > port-number for the connection (which varies between connections), so > the comparison always fails. > > Change the code so we only consider the host-address, by introducing the > addrcmp()-function that inspects the address family and compare as > appropriate. > > Signed-off-by: Erik Faye-Lund > --- Makes sense. ```