From: Roger Wolff <R.E.Wolff@BitWizard.nl>
Date: Fri, 15 Aug 2014 09:48:16 +0000 (+0200)
Subject: fixed warning in net.c, fixed missing define of NSCOUNT in dns.c
X-Git-Tag: v0.86~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2aa603a0251148602731c1ae2857f032d0bad0;p=thirdparty%2Fmtr.git

fixed warning in net.c, fixed missing define of NSCOUNT in dns.c
---

diff --git a/dns.c b/dns.c
index c5c3c1a..013e968 100644
--- a/dns.c
+++ b/dns.c
@@ -72,6 +72,12 @@
 //#define NSCOUNT6 myres.nscount
 //#define NSSOCKADDR6(i) (&(myres._u._ext.ext->nsaddrs[i].sin6))
 //#endif
+#else
+
+// No IPV6
+#define NSCOUNT myres.nscount
+#define NSCOUNT6 0
+#define NSSOCKADDR6(i) NULL
 #endif
 
 
diff --git a/net.c b/net.c
index d43054b..7ce9d7f 100644
--- a/net.c
+++ b/net.c
@@ -305,10 +305,13 @@ void net_send_tcp(int index)
   int port;
   struct sockaddr_storage local;
   struct sockaddr_storage remote;
-  struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-  struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
+  struct sockaddr_in  *local4  = (struct sockaddr_in  *) &local;
+  struct sockaddr_in  *remote4 = (struct sockaddr_in  *) &remote;
+#ifdef ENABLE_IPV6
+  struct sockaddr_in6 *local6  = (struct sockaddr_in6 *) &local;
   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
+#endif
+
   socklen_t len;
 
   ttl = index + 1;