Git development
 help / color / mirror / Atom feed
* [PATCH 5/5] struct sockaddr_storage->ss_family is not portable
@ 2010-03-11 16:37 Gary V. Vaughan
  2010-03-11 16:40 ` Martin Storsjö
  2010-03-11 22:27 ` Jeff King
  0 siblings, 2 replies; 17+ messages in thread
From: Gary V. Vaughan @ 2010-03-11 16:37 UTC (permalink / raw)
  To: git; +Cc: Jeff King, Erik Faye-Lund

Many of our supported platforms do not have this declaration, for
example solaris2.6 thru 2.7.  Lack of ss_family implies no IPV6
support, so we can wrap all the ss_family references in an ifndef
NO_IPV6, and assume sockaddr_in otherwise.

Actually, the test for setting NO_IPV6 at configure time is still
too optimistic and I have to manually pass '-DNO_IPV6' in CPPFLAGS
at build time on aix-5.2.0.0 and earlier, and irix-6.5 and older
for them to pick up the right branch.
---
 daemon.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/daemon.c b/daemon.c
index 6bc1c23..c9ea500 100644
--- a/daemon.c
+++ b/daemon.c
@@ -591,17 +591,23 @@ static int execute(struct sockaddr *addr)
 static int addrcmp(const struct sockaddr_storage *s1,
     const struct sockaddr_storage *s2)
 {
+#ifndef NO_IPV6
 	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));
+#else
+	/* Assume AF_INET or equivalent for the likes of Solaris 2.7,
+	   HP/UX 11.00 and others do not implement ss_family */
+	return memcmp(&((struct sockaddr_in *)s1)->sin_addr,
+	    &((struct sockaddr_in *)s2)->sin_addr,
+	    sizeof(struct in_addr));
 #endif
 	return 0;
 }
-- 
1.7.0.2

-- 
Gary V. Vaughan (gary@thewrittenword.com)

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2010-04-26 16:55 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-11 16:37 [PATCH 5/5] struct sockaddr_storage->ss_family is not portable Gary V. Vaughan
2010-03-11 16:40 ` Martin Storsjö
2010-03-12  4:56   ` Gary V. Vaughan
2010-03-12  7:24     ` Martin Storsjö
2010-03-15 21:03       ` [PATCH] daemon.c: avoid accessing ss_family member of struct sockaddr_storage Brandon Casey
2010-03-15 21:29         ` Jeff King
2010-03-15 21:41           ` Martin Storsjö
2010-03-15 21:42           ` Brandon Casey
2010-04-25  8:37             ` Gary V. Vaughan
2010-03-15 21:37         ` Martin Storsjö
2010-03-15 22:10           ` [PATCH v2] " Brandon Casey
2010-03-16  7:52             ` Martin Storsjö
2010-04-25  8:36       ` [PATCH 5/5] struct sockaddr_storage->ss_family is not portable Gary V. Vaughan
2010-04-25 19:05         ` Martin Storsjö
2010-04-26 16:55           ` Gary V. Vaughan
2010-03-11 22:27 ` Jeff King
2010-03-11 23:57   ` Brandon Casey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox