X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=3b5d5b05d7eb8ed2cc11109da1bd995ade9d656b;hp=039082e60815770a73539a8f6477ab78c62cbdca;hb=106fc2b769a635142bf5f9233a2f03e3a0f26b7f;hpb=dbc5b5bb5eb3096ad930aa6b590deaba2a103dfc

diff --git a/src/netutl.c b/src/netutl.c
index 039082e6..3b5d5b05 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: netutl.c,v 1.12.4.26 2002/02/20 22:15:32 guus Exp $
+    $Id: netutl.c,v 1.12.4.32 2002/03/18 14:39:37 guus Exp $
 */
 
 #include "config.h"
@@ -43,6 +43,10 @@
 
 #include "system.h"
 
+#ifndef s6_addr32
+#define s6_addr32 __u6_addr.__u6_addr32
+#endif
+
 int hostnames = 0;
 
 /*
@@ -101,9 +105,10 @@ void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
 {
   char address[NI_MAXHOST];
   char port[NI_MAXSERV];
+  char *scopeid;
   int err;
 cp
-  if((err = getnameinfo(&sa->sa, SA_LEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
+  if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
     {
       syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err));
       cp_trace();
@@ -111,6 +116,11 @@ cp
       exit(0);
     }
 
+#ifdef HAVE_LINUX
+  if((scopeid = strchr(address, '%')))
+    *scopeid = '\0';  /* Descope. */
+#endif
+
   *addrstr = xstrdup(address);
   *portstr = xstrdup(port);
 cp
@@ -123,7 +133,7 @@ char *sockaddr2hostname(sockaddr_t *sa)
   char port[NI_MAXSERV] = "unknown";
   int err;
 cp
-  if((err = getnameinfo(&sa->sa, SA_LEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
+  if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
     {
       syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err));
     }
@@ -147,9 +157,15 @@ cp
       case AF_UNSPEC:
         return 0;
       case AF_INET:
-	return memcmp(&a->in, &b->in, sizeof(a->in));
+	result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+	if(result)
+	  return result;
+	return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port));
       case AF_INET6:
-	return memcmp(&a->in6, &b->in6, sizeof(a->in6));
+	result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+	if(result)
+	  return result;
+	return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
       default:
         syslog(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"), a->sa.sa_family);
 	cp_trace();
@@ -159,6 +175,15 @@ cp
 cp
 }
 
+void sockaddrunmap(sockaddr_t *sa)
+{
+  if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
+    {
+      sa->in.sin_addr.s_addr = sa->in6.sin6_addr.s6_addr32[3];
+      sa->in.sin_family = AF_INET;
+    }
+}
+
 /* Subnet mask handling */
 
 int maskcmp(char *a, char *b, int masklen, int len)