Reverting back to version 1.1, the multicasting code needs to be looked at

very closely before these changes can be made.

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index cd0e39a..111b88e 100644 (file)
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -60,10 +60,7 @@ static char sccsid[] = "@(#)ifconfig.c       5.1 (Berkeley) 2/28/91";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

-/*#ifdef notdef
-This is OK now because we have these headers available, and someone might
-actually want to use these.
-*/
+#ifdef notdef

 #define        NSIP
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #define        NSIP
 #include <netns/ns.h>
 #include <netns/ns_if.h>


@@ -71,7 +68,7 @@ actually want to use these.
 #define EON
 #include <netiso/iso.h>
 #include <netiso/iso_var.h>
 #define EON
 #include <netiso/iso.h>
 #include <netiso/iso_var.h>

-/*#endif*/
+#endif

 #include <netdb.h>
 #include <sys/protosw.h>
 
 #include <netdb.h>
 #include <sys/protosw.h>
 


@@ -107,9 +104,6 @@ int setifmetric(), setifbroadaddr(), setifipdst();
 int    notealias(), setsnpaoffset(), setnsellength();
 
 #define        NEXTARG         0xffffff
 int    notealias(), setsnpaoffset(), setnsellength();
 
 #define        NEXTARG         0xffffff

-#ifndef IFF_ALTPHYS
-#  define IFF_ALTPHYS IFF_LLC0 /* grrr... */
-#endif

 
 struct cmd {
        char    *c_name;
 
 struct cmd {
        char    *c_name;


@@ -124,8 +118,8 @@ struct      cmd {
        { "-arp",       IFF_NOARP,      setifflags },
        { "debug",      IFF_DEBUG,      setifflags },
        { "-debug",     -IFF_DEBUG,     setifflags },
        { "-arp",       IFF_NOARP,      setifflags },
        { "debug",      IFF_DEBUG,      setifflags },
        { "-debug",     -IFF_DEBUG,     setifflags },

-       { "aui",        IFF_ALTPHYS,    setifflags },   /* 06 Sep 92*/
-       { "bnc",        -IFF_ALTPHYS,   setifflags },
+       { "aui",        IFF_LLC0,       setifflags },   /* 06 Sep 92*/
+       { "bnc",        -IFF_LLC0,      setifflags },

        { "llc0",       IFF_LLC0,       setifflags },   /* 10 Mar 93 */
        { "-llc0",      -IFF_LLC0,      setifflags },
        { "llc1",       IFF_LLC1,       setifflags },
        { "llc0",       IFF_LLC0,       setifflags },   /* 10 Mar 93 */
        { "-llc0",      -IFF_LLC0,      setifflags },
        { "llc1",       IFF_LLC1,       setifflags },


@@ -602,8 +596,8 @@ in_getaddr(s, which)
        if (which != MASK)
                sin->sin_family = AF_INET;
 
        if (which != MASK)
                sin->sin_family = AF_INET;
 

-       if (inet_aton(s, &sin->sin_addr) != 0)
-               ; /* work done by inet_aton */
+       if ((val = inet_addr(s)) != -1)
+               sin->sin_addr.s_addr = val;

        else if (hp = gethostbyname(s))
                bcopy(hp->h_addr, (char *)&sin->sin_addr, hp->h_length);
        else if (np = getnetbyname(s))
        else if (hp = gethostbyname(s))
                bcopy(hp->h_addr, (char *)&sin->sin_addr, hp->h_length);
        else if (np = getnetbyname(s))


@@ -704,7 +698,7 @@ setnsellength(val)
        }
 }
 
        }
 }
 

-#ifdef EON
+#ifdef notdef

 fixnsel(s)
 register struct sockaddr_iso *s;
 {
 fixnsel(s)
 register struct sockaddr_iso *s;
 {


@@ -716,7 +710,7 @@ register struct sockaddr_iso *s;
 
 adjust_nsellength()
 {
 
 adjust_nsellength()
 {

-#ifdef EON
+#ifdef notdef

        fixnsel(sisotab[RIDADDR]);
        fixnsel(sisotab[ADDR]);
        fixnsel(sisotab[DSTADDR]);
        fixnsel(sisotab[RIDADDR]);
        fixnsel(sisotab[ADDR]);
        fixnsel(sisotab[DSTADDR]);