From: "Gary V. Vaughan" <git@mlists.thewrittenword.com>
To: git@vger.kernel.org
Subject: Portability patches vs 1.7.0.2 [5/6]
Date: Tue, 9 Mar 2010 16:19:06 +0000 [thread overview]
Message-ID: <20100309161906.GF99172@thor.il.thewrittenword.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]
## sockaddr_t->ss_family is not portable
Many of our supported platforms do not have this declaration, for
example solaris2.6 thru 2.8 (I can find a complete list of which of
our supported platforms have this problem).
Normally, I would solve this by importing the relevant modules from
gnulib and linking in the portable equivalent (hence the name of the
patch: gnulib.patch). But in this case, since git is not built using
Automake, I decided that it would be easier to simply revert the part
of the code that was triggering this problem back to what was used in
git-1.6.6. So that is what this patch represents.
Actually, I'd like some advice on whether this was a good idea? Was
the change to the code in git-1.7.0 introduced in response to a bug
(latent or reported) that is fixed by the code I reverted in this
patch? If so, what is the right way to fix it (assuming you don't
want to introduce a dependency on gnulib and Automake into git)?
Cheers,
--
Gary V. Vaughan (gary@thewrittenword.com)
[-- Attachment #2: gnulib.patch --]
[-- Type: text/x-diff, Size: 1508 bytes --]
Index: daemon.c
===================================================================
--- daemon.c.orig
+++ daemon.c
@@ -588,24 +588,6 @@ 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;
@@ -625,7 +607,7 @@ static void add_child(pid_t pid, struct
newborn->pid = pid;
memcpy(&newborn->address, addr, addrlen);
for (cradle = &firstborn; *cradle; cradle = &(*cradle)->next)
- if (!addrcmp(&(*cradle)->address, &newborn->address))
+ if (!memcmp(&(*cradle)->address, &newborn->address, sizeof(newborn->address)))
break;
newborn->next = *cradle;
*cradle = newborn;
@@ -658,7 +640,7 @@ static void kill_some_child(void)
return;
for (; (next = blanket->next); blanket = next)
- if (!addrcmp(&blanket->address, &next->address)) {
+ if (!memcmp(&blanket->address, &next->address, sizeof(next->address))) {
kill(blanket->pid, SIGTERM);
break;
}
next reply other threads:[~2010-03-09 16:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-09 16:19 Gary V. Vaughan [this message]
2010-03-09 17:08 ` Portability patches vs 1.7.0.2 [5/6] Erik Faye-Lund
2010-03-09 23:26 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100309161906.GF99172@thor.il.thewrittenword.com \
--to=git@mlists.thewrittenword.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).