More fixes

diff --git a/ChangeLog b/ChangeLog
index d3a801a..b2f6e0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 Sun Jan 25 13:00:00 1998  Philip Blundell  <Philip.Blundell@pobox.com>
 
+       * lib/net-string.c (str_in_buff): Avoid compiler warning.
+
        * lib/inet6_gr.c, lib/inet_gr.c: Don't display inactive routes
        (ie those without RTF_UP).
 
+       * lib/Makefile: Add support for Rose, FDDI and Ash.
+
        * rarp.c: Add support for /etc/ethers.  Patch from haardt@gmd.de
        (Michael Haardt).
 
@@ -16,6 +20,9 @@ Sun Jan 25 13:00:00 1998  Philip Blundell  <Philip.Blundell@pobox.com>
        interfaces to display; use SIOCGIFCONF with a null buffer
        instead.
 
+       * ifconfig.c: Don't assume ifr_qlen is defined if SIOCSIFTXQLEN
+       is.
+       
 Tue Sep 23 20:58:27 1997  Philip Blundell  <Philip.Blundell@pobox.com>
 
        * ifconfig.c (if_getstats): use _PATH_PROCNET_DEV rather than

diff --git a/config.in b/config.in
index bf61a77..4290777 100644 (file)
--- a/config.in
+++ b/config.in
@@ -58,8 +58,8 @@ bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
 bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
 bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
 bool 'Appletalk DDP protocol family' HAVE_AFATALK y
-bool 'AX25 (Packet Radio) protocol family' HAVE_AFAX25 y
-bool 'NET/ROM (Packet Radio) protocol family' HAVE_AFNETROM y
+bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
+bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
 bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
 *
 *
@@ -71,11 +71,10 @@ bool 'SLIP (serial line) support' HAVE_HWSLIP y
 bool 'PPP (serial line) support' HAVE_HWPPP y
 bool 'IPIP Tunnel support' HAVE_HWTUNNEL y
 bool 'Token ring (generic) support' HAVE_HWTR y
-bool 'AX25 (Packet Radio) support' HAVE_HWAX25 y
-bool 'NET/ROM (Packet Radio) support' HAVE_HWNETROM y
-bool 'DLCI/FRAD (Frame Relay) support' HAVE_HWFR y
+bool 'AX25 (packet radio) support' HAVE_HWAX25 y
+bool 'Rose (packet radio) support' HAVE_HWROSE n
+bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
+bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
 bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
 bool 'FDDI (generic) support' HAVE_HWFDDI n
-bool 'Rose (packet radio) support' HAVE_HWROSE n
-bool 'Ash support' HAVE_HWASH y
-
+bool 'Ash hardware support' HAVE_HWASH n

diff --git a/ifconfig.c b/ifconfig.c
index 46a263e..ef5697c 100644 (file)
--- a/ifconfig.c
+++ b/ifconfig.c
@@ -78,6 +78,9 @@ struct in6_ifreq {
 #ifndef SIOCSIFTXQLEN /* 2.1.77+ option */
 #define SIOCGIFTXQLEN  0x8942          /* Get the tx queue length      */
 #define SIOCSIFTXQLEN  0x8943          /* Set the tx queue length      */
+#endif
+
+#ifndef ifr_qlen
 #define ifr_qlen       ifr_ifru.ifru_ivalue    /* Queue length         */
 #endif
 

diff --git a/lib/Makefile b/lib/Makefile
index 1901b4f..f116685 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,9 +29,9 @@
 #
 
 
-HWOBJS  = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o
-AFOBJS  = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o
-AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o getroute.o
+HWOBJS  = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o
+AFOBJS  = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o
+AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o
 AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o
 ACTOBJS  = slip_ac.o ppp_ac.o activate.o
 VARIA   = getargs.o masq_info.o

diff --git a/lib/net-string.c b/lib/net-string.c
index ed455b2..ff39c0b 100644 (file)
--- a/lib/net-string.c
+++ b/lib/net-string.c
@@ -75,7 +75,9 @@ char *str_in_buff (char *buff, int len, char *string)
        buff[len] = '\0';
       }
     else
-      strcpy (buff, string);
+      {
+       strcpy (buff, string);
+      }
   else
     strcpy (buff, "");