Fix IPv6 compilation problems.

`netstat -c -i' works now (reported by rogerk@tis.com)
Update RPM spec & makefile for new tools.

diff --git a/Makefile b/Makefile
index 44dc31c..cf6d887 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -197,12 +197,16 @@ ipmaddr:  $(NET-LIB) ipmaddr.o
 installbin:
        install -m 0755 -d ${BASEDIR}/sbin
        install -m 0755 -d ${BASEDIR}/bin
-       install -m 0755 arp      ${BASEDIR}/sbin
-       install -m 0755 ifconfig ${BASEDIR}/sbin
-       install -m 0755 netstat  ${BASEDIR}/bin
-       install -m 0755 rarp     ${BASEDIR}/sbin
-       install -m 0755 route    ${BASEDIR}/sbin
-       install -m 0755 hostname ${BASEDIR}/bin
+       install -m 0755 arp        ${BASEDIR}/sbin
+       install -m 0755 ifconfig   ${BASEDIR}/sbin
+       install -m 0755 netstat    ${BASEDIR}/bin
+       install -m 0755 rarp       ${BASEDIR}/sbin
+       install -m 0755 route      ${BASEDIR}/sbin
+       install -m 0755 hostname   ${BASEDIR}/bin
+       install -m 0755 slattach   $(BASEDIR)/sbin
+       install -m 0755 plipconfig $(BASEDIR)/sbin
+       install -m 0755 ipmaddr    $(BASEDIR)/sbin
+       install -m 0755 iptunnel   $(BASEDIR)/sbin
        ln -fs hostname $(BASEDIR)/bin/dnsdomainname
        ln -fs hostname $(BASEDIR)/bin/ypdomainname
        ln -fs hostname $(BASEDIR)/bin/nisdomainname

diff --git a/RPM/net-tools.spec b/RPM/net-tools.spec
index 44c814a..86b45db 100644 (file)
--- a/RPM/net-tools.spec
+++ b/RPM/net-tools.spec
@@ -1,6 +1,6 @@
 Summary: Basic Networking Tools
 Name: net-tools
-Version: 1.49
+Version: 1.50
 Release: 1
 Copyright: GPL
 Group: Networking/Admin
@@ -11,7 +11,7 @@ BuildRoot: /var/tmp/%{name}-root
 %description
 This is a collection of the basic tools necessary for setting up networking
 on a Linux machine. It includes ifconfig, route, netstat, rarp, and
-some other minor tools.
+various other tools.
 
 %prep
 %setup  -q
@@ -31,7 +31,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/man/man8
 make BASEDIR=$RPM_BUILD_ROOT install
 
 ( cd $RPM_BUILD_ROOT/sbin
-  strip arp ifconfig rarp route
+  strip arp ifconfig rarp route slattach plipconfig ipmaddr iptunnel
   cd ../bin
   strip hostname netstat
 ) 
@@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ifconfig
 /sbin/rarp
 /sbin/route
+/sbin/slattach
+/sbin/plipconfig
+/sbin/ipmaddr
+/sbin/iptunnel
 /bin/domainname
 /bin/dnsdomainname
 /bin/hostname
@@ -57,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/locale/*/LC_MESSAGES/net-tools.mo
 
 %changelog
+* Sun Jan 10 1999 Phil Blundell <philb@gnu.org>
+- update to 1.50
+- add new stuff to %files and strip it in %install
+
 * Thu Nov 26 1998 Phil Blundell <pb@nexus.co.uk>
 - update to 1.48.
 

diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c
index e4656a0..84d9cf9 100644 (file)
--- a/lib/inet6_sr.c
+++ b/lib/inet6_sr.c
@@ -13,7 +13,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
-/* #include <net/route.h> realy broken */
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <ctype.h>
@@ -24,7 +23,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#ifndef __GLIBC__
+#ifdef __GLIBC__
+#include <net/route.h>
+#else
 #include <netinet6/ipv6_route.h>       /* glibc does not have this */
 #endif
 #include "version.h"

diff --git a/lib/utils.c b/lib/utils.c
index c0be22d..79742ae 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -25,6 +25,7 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <resolv.h>
+#include <asm/types.h>
 #include <linux/pkt_sched.h>
 
 #include "utils.h"

diff --git a/netstat.c b/netstat.c
index 6b138a6..34494ee 100644 (file)
--- a/netstat.c
+++ b/netstat.c
@@ -6,7 +6,7 @@
  *              NET-3 Networking Distribution for the LINUX operating
  *              system.
  *
- * Version:     $Id: netstat.c,v 1.16 1999/01/05 20:53:00 philip Exp $
+ * Version:     $Id: netstat.c,v 1.17 1999/01/10 18:05:06 philip Exp $
  *
  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
@@ -494,7 +494,7 @@ static void udp_do_one(int lnr, const char *line)
     }
 
 #if HAVE_AFINET6
-#define notnull(A) ((A.sin6_family == AF_INET6) && \
+#define notnull(A) (((A.sin6_family == AF_INET6) && \
         ((A.sin6_addr.s6_addr32[0]) ||            \
          (A.sin6_addr.s6_addr32[1]) ||            \
          (A.sin6_addr.s6_addr32[2]) ||            \
@@ -1088,7 +1088,8 @@ static int iface_info(void)
        perror(_("missing interface information"));
        exit(1);
     }
-    close(skfd);
+    if (!flag_cnt)
+        close(skfd);
     skfd = -1;
 
     return 0;