new copyright notice

[unix-history] / usr / src / sys / netinet / in.c

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index 2588fb4..2fa1b8a 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -1,4 +1,11 @@
-/*     in.c    6.6     85/03/18        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)in.c        7.15 (Berkeley) %G%
+ */

 
 #include "param.h"
 #include "ioctl.h"
 
 #include "param.h"
 #include "ioctl.h"


@@ -6,8 +13,6 @@
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"

-#include "uio.h"
-#include "dir.h"

 #include "user.h"
 #include "in_systm.h"
 #include "../net/if.h"
 #include "user.h"
 #include "in_systm.h"
 #include "../net/if.h"


@@ -17,27 +22,6 @@
 #include "in_var.h"
 
 #ifdef INET
 #include "in_var.h"
 
 #ifdef INET

-inet_hash(sin, hp)
-       register struct sockaddr_in *sin;
-       struct afhash *hp;
-{
-       register u_long n;
-
-       n = in_netof(sin->sin_addr);
-       if (n)
-           while ((n & 0xff) == 0)
-               n >>= 8;
-       hp->afh_nethash = n;
-       hp->afh_hosthash = ntohl(sin->sin_addr.s_addr);
-}
-
-inet_netmatch(sin1, sin2)
-       struct sockaddr_in *sin1, *sin2;
-{
-
-       return (in_netof(sin1->sin_addr) == in_netof(sin2->sin_addr));
-}
-

 /*
  * Formulate an Internet address from network + host.
  */
 /*
  * Formulate an Internet address from network + host.
  */


@@ -67,6 +51,7 @@ in_makeaddr(net, host)
 /*
  * Return the network number from an internet address.
  */
 /*
  * Return the network number from an internet address.
  */

+u_long

 in_netof(in)
        struct in_addr in;
 {
 in_netof(in)
        struct in_addr in;
 {


@@ -78,22 +63,72 @@ in_netof(in)
                net = i & IN_CLASSA_NET;
        else if (IN_CLASSB(i))
                net = i & IN_CLASSB_NET;
                net = i & IN_CLASSA_NET;
        else if (IN_CLASSB(i))
                net = i & IN_CLASSB_NET;

-       else
+       else if (IN_CLASSC(i))

                net = i & IN_CLASSC_NET;
                net = i & IN_CLASSC_NET;

+       else
+               return (0);

 
        /*
         * Check whether network is a subnet;
         * if so, return subnet number.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)
 
        /*
         * Check whether network is a subnet;
         * if so, return subnet number.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)

-               if ((ia->ia_netmask & net) == ia->ia_net)
+               if (net == ia->ia_net)

                        return (i & ia->ia_subnetmask);
        return (net);
 }
 
                        return (i & ia->ia_subnetmask);
        return (net);
 }
 

+/*
+ * Compute and save network mask as sockaddr from an internet address.
+ */
+in_sockmaskof(in, sockmask)
+       struct in_addr in;
+       register struct sockaddr_in *sockmask;
+{
+       register u_long net;
+       register u_long mask;
+    {
+       register u_long i = ntohl(in.s_addr);
+
+       if (i == 0)
+               net = 0, mask = 0;
+       else if (IN_CLASSA(i))
+               net = i & IN_CLASSA_NET, mask = IN_CLASSA_NET;
+       else if (IN_CLASSB(i))
+               net = i & IN_CLASSB_NET, mask = IN_CLASSB_NET;
+       else if (IN_CLASSC(i))
+               net = i & IN_CLASSC_NET, mask = IN_CLASSC_NET;
+       else
+               net = i, mask = -1;
+    }
+    {
+       register struct in_ifaddr *ia;
+       /*
+        * Check whether network is a subnet;
+        * if so, return subnet number.
+        */
+       for (ia = in_ifaddr; ia; ia = ia->ia_next)
+               if (net == ia->ia_net)
+                       mask =  ia->ia_subnetmask;
+    }
+    {
+       register char *cpbase = (char *)&(sockmask->sin_addr);
+       register char *cp = (char *)(1 + &(sockmask->sin_addr));
+
+       sockmask->sin_addr.s_addr = htonl(mask);
+       sockmask->sin_len = 0;
+       while (--cp >= cpbase)
+               if (*cp) {
+                       sockmask->sin_len = 1 + cp - (caddr_t)sockmask;
+                       break;
+               }
+    }
+}
+

 /*
  * Return the host portion of an internet address.
  */
 /*
  * Return the host portion of an internet address.
  */

+u_long

 in_lnaof(in)
        struct in_addr in;
 {
 in_lnaof(in)
        struct in_addr in;
 {


@@ -107,49 +142,79 @@ in_lnaof(in)
        } else if (IN_CLASSB(i)) {
                net = i & IN_CLASSB_NET;
                host = i & IN_CLASSB_HOST;
        } else if (IN_CLASSB(i)) {
                net = i & IN_CLASSB_NET;
                host = i & IN_CLASSB_HOST;

-       } else {
+       } else if (IN_CLASSC(i)) {

                net = i & IN_CLASSC_NET;
                host = i & IN_CLASSC_HOST;
                net = i & IN_CLASSC_NET;
                host = i & IN_CLASSC_HOST;

-       }
+       } else
+               return (i);

 
        /*
         * Check whether network is a subnet;
         * if so, use the modified interpretation of `host'.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)
 
        /*
         * Check whether network is a subnet;
         * if so, use the modified interpretation of `host'.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)

-               if ((ia->ia_netmask & net) == ia->ia_net)
+               if (net == ia->ia_net)

                        return (host &~ ia->ia_subnetmask);
        return (host);
 }
 
                        return (host &~ ia->ia_subnetmask);
        return (host);
 }
 

+#ifndef SUBNETSARELOCAL
+#define        SUBNETSARELOCAL 1
+#endif
+int subnetsarelocal = SUBNETSARELOCAL;

 /*
  * Return 1 if an internet address is for a ``local'' host
 /*
  * Return 1 if an internet address is for a ``local'' host

- * (one to which we have a connection).
+ * (one to which we have a connection).  If subnetsarelocal
+ * is true, this includes other subnets of the local net.
+ * Otherwise, it includes only the directly-connected (sub)nets.

  */
 in_localaddr(in)
        struct in_addr in;
 {
        register u_long i = ntohl(in.s_addr);
  */
 in_localaddr(in)
        struct in_addr in;
 {
        register u_long i = ntohl(in.s_addr);

-       register u_long net;

        register struct in_ifaddr *ia;
 
        register struct in_ifaddr *ia;
 

-       if (IN_CLASSA(i))
-               net = i & IN_CLASSA_NET;
-       else if (IN_CLASSB(i))
-               net = i & IN_CLASSB_NET;
-       else
-               net = i & IN_CLASSC_NET;
-
-       for (ia = in_ifaddr; ia; ia = ia->ia_next)
-               if ((ia->ia_netmask & net) == ia->ia_net)
-                       return (1);
+       if (subnetsarelocal) {
+               for (ia = in_ifaddr; ia; ia = ia->ia_next)
+                       if ((i & ia->ia_netmask) == ia->ia_net)
+                               return (1);
+       } else {
+               for (ia = in_ifaddr; ia; ia = ia->ia_next)
+                       if ((i & ia->ia_subnetmask) == ia->ia_subnet)
+                               return (1);
+       }

        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Determine whether an IP address is in a reserved set of addresses
+ * that may not be forwarded, or whether datagrams to that destination
+ * may be forwarded.
+ */
+in_canforward(in)
+       struct in_addr in;
+{
+       register u_long i = ntohl(in.s_addr);
+       register u_long net;
+
+       if (IN_EXPERIMENTAL(i))
+               return (0);
+       if (IN_CLASSA(i)) {
+               net = i & IN_CLASSA_NET;
+               if (net == 0 || net == IN_LOOPBACKNET)
+                       return (0);
+       }
+       return (1);
+}
+
+int    in_interfaces;          /* number of external internet interfaces */
+extern struct ifnet loif;
+

 /*
  * Generic internet control operations (ioctl's).
  * Ifp is 0 if not an interface-specific ioctl.
  */
 /*
  * Generic internet control operations (ioctl's).
  * Ifp is 0 if not an interface-specific ioctl.
  */

+/* ARGSUSED */

 in_control(so, cmd, data, ifp)
        struct socket *so;
        int cmd;
 in_control(so, cmd, data, ifp)
        struct socket *so;
        int cmd;


@@ -158,9 +223,13 @@ in_control(so, cmd, data, ifp)
 {
        register struct ifreq *ifr = (struct ifreq *)data;
        register struct in_ifaddr *ia = 0;
 {
        register struct ifreq *ifr = (struct ifreq *)data;
        register struct in_ifaddr *ia = 0;

-       struct ifaddr *ifa;
+       register struct ifaddr *ifa;
+       struct in_ifaddr *oia;
+       struct in_aliasreq *ifra = (struct in_aliasreq *)data;

        struct mbuf *m;
        struct mbuf *m;

-       int error;
+       struct sockaddr_in oldaddr;
+       int error, hostIsNew, maskIsNew;
+       u_long i;

 
        /*
         * Find address for this interface, if it exists.
 
        /*
         * Find address for this interface, if it exists.


@@ -172,20 +241,23 @@ in_control(so, cmd, data, ifp)
 
        switch (cmd) {
 
 
        switch (cmd) {
 

-       case SIOCGIFADDR:
-       case SIOCGIFBRDADDR:
-       case SIOCGIFDSTADDR:
-       case SIOCGIFNETMASK:
-               if (ia == (struct in_ifaddr *)0)
+       case SIOCAIFADDR:
+       case SIOCDIFADDR:
+               if (ifra->ifra_addr.sin_family == AF_INET)
+                   for (oia = ia; ia; ia = ia->ia_next) {
+                       if (ia->ia_ifp == ifp  &&
+                           ia->ia_addr.sin_addr.s_addr ==
+                               ifra->ifra_addr.sin_addr.s_addr)
+                           break;
+               }
+               if (cmd == SIOCDIFADDR && ia == 0)

                        return (EADDRNOTAVAIL);
                        return (EADDRNOTAVAIL);

-               break;
-
+               /* FALLTHROUGH */

        case SIOCSIFADDR:
        case SIOCSIFADDR:

-       case SIOCSIFDSTADDR:
-       case SIOCSIFBRDADDR:

        case SIOCSIFNETMASK:
        case SIOCSIFNETMASK:

-               if (!suser())
-                       return (u.u_error);
+       case SIOCSIFDSTADDR:
+               if (error = suser(u.u_cred, &u.u_acflag))
+                       return (error);

 
                if (ifp == 0)
                        panic("in_control");
 
                if (ifp == 0)
                        panic("in_control");


@@ -206,57 +278,152 @@ in_control(so, cmd, data, ifp)
                                ifa->ifa_next = (struct ifaddr *) ia;
                        } else
                                ifp->if_addrlist = (struct ifaddr *) ia;
                                ifa->ifa_next = (struct ifaddr *) ia;
                        } else
                                ifp->if_addrlist = (struct ifaddr *) ia;

+                       ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
+                       ia->ia_ifa.ifa_dstaddr
+                                       = (struct sockaddr *)&ia->ia_dstaddr;
+                       ia->ia_ifa.ifa_netmask
+                                       = (struct sockaddr *)&ia->ia_sockmask;
+                       ia->ia_sockmask.sin_len = 8;
+                       if (ifp->if_flags & IFF_BROADCAST) {
+                               ia->ia_broadaddr.sin_len = sizeof(ia->ia_addr);
+                               ia->ia_broadaddr.sin_family = AF_INET;
+                       }

                        ia->ia_ifp = ifp;
                        ia->ia_ifp = ifp;

-                       IA_SIN(ia)->sin_family = AF_INET;
+                       if (ifp != &loif)
+                               in_interfaces++;

                }
                break;
                }
                break;

-       }

 
 

+       case SIOCSIFBRDADDR:
+               if (error = suser(u.u_cred, &u.u_acflag))
+                       return (error);
+               /* FALLTHROUGH */
+
+       case SIOCGIFADDR:
+       case SIOCGIFNETMASK:
+       case SIOCGIFDSTADDR:
+       case SIOCGIFBRDADDR:
+               if (ia == (struct in_ifaddr *)0)
+                       return (EADDRNOTAVAIL);
+               break;
+
+       default:
+               return (EOPNOTSUPP);
+               break;
+       }

        switch (cmd) {
 
        case SIOCGIFADDR:
        switch (cmd) {
 
        case SIOCGIFADDR:

-               ifr->ifr_addr = ia->ia_addr;
+               *((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_addr;

                break;
 
        case SIOCGIFBRDADDR:
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);
                break;
 
        case SIOCGIFBRDADDR:
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);

-               ifr->ifr_dstaddr = ia->ia_broadaddr;
+               *((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_broadaddr;

                break;
 
        case SIOCGIFDSTADDR:
                if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
                        return (EINVAL);
                break;
 
        case SIOCGIFDSTADDR:
                if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
                        return (EINVAL);

-               ifr->ifr_dstaddr = ia->ia_dstaddr;
+               *((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_dstaddr;

                break;
 
        case SIOCGIFNETMASK:
                break;
 
        case SIOCGIFNETMASK:

-#define        satosin(sa)     ((struct sockaddr_in *)(sa))
-               satosin(&ifr->ifr_addr)->sin_family = AF_INET;
-               satosin(&ifr->ifr_addr)->sin_addr.s_addr = htonl(ia->ia_subnetmask);
+               *((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask;

                break;
 
        case SIOCSIFDSTADDR:
                if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
                        return (EINVAL);
                break;
 
        case SIOCSIFDSTADDR:
                if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
                        return (EINVAL);

+               oldaddr = ia->ia_dstaddr;
+               ia->ia_dstaddr = *(struct sockaddr_in *)&ifr->ifr_dstaddr;

                if (ifp->if_ioctl &&
                if (ifp->if_ioctl &&

-                   (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, ia)))
+                   (error = (*ifp->if_ioctl)(ifp, SIOCSIFDSTADDR, ia))) {
+                       ia->ia_dstaddr = oldaddr;

                        return (error);
                        return (error);

-               ia->ia_dstaddr = ifr->ifr_dstaddr;
+               }
+               if (ia->ia_flags & IFA_ROUTE) {
+                       ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&oldaddr;
+                       rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
+                       ia->ia_ifa.ifa_dstaddr = (struct sockaddr *)&ia->ia_addr;
+                       rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
+               }

                break;
 
        case SIOCSIFBRDADDR:
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);
                break;
 
        case SIOCSIFBRDADDR:
                if ((ifp->if_flags & IFF_BROADCAST) == 0)
                        return (EINVAL);

-               ia->ia_broadaddr = ifr->ifr_broadaddr;
+               ia->ia_broadaddr = *(struct sockaddr_in *)&ifr->ifr_broadaddr;

                break;
 
        case SIOCSIFADDR:
                break;
 
        case SIOCSIFADDR:

-               return (in_ifinit(ifp, ia, &ifr->ifr_addr));
-               break;
+               return (in_ifinit(ifp, ia,
+                   (struct sockaddr_in *) &ifr->ifr_addr, 1));

 
        case SIOCSIFNETMASK:
 
        case SIOCSIFNETMASK:

-               ia->ia_subnetmask = ntohl(satosin(&ifr->ifr_addr)->sin_addr.s_addr);
+               i = ifra->ifra_addr.sin_addr.s_addr;
+               ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr = i);
+               break;
+
+       case SIOCAIFADDR:
+               maskIsNew = 0;
+               hostIsNew = 1;
+               error = 0;
+               if (ia->ia_addr.sin_family == AF_INET) {
+                       if (ifra->ifra_addr.sin_len == 0) {
+                               ifra->ifra_addr = ia->ia_addr;
+                               hostIsNew = 0;
+                       } else if (ifra->ifra_addr.sin_addr.s_addr ==
+                                              ia->ia_addr.sin_addr.s_addr)
+                               hostIsNew = 0;
+               }
+               if (ifra->ifra_mask.sin_len) {
+                       in_ifscrub(ifp, ia);
+                       ia->ia_sockmask = ifra->ifra_mask;
+                       ia->ia_subnetmask =
+                            ntohl(ia->ia_sockmask.sin_addr.s_addr);
+                       maskIsNew = 1;
+               }
+               if ((ifp->if_flags & IFF_POINTOPOINT) &&
+                   (ifra->ifra_dstaddr.sin_family == AF_INET)) {
+                       in_ifscrub(ifp, ia);
+                       ia->ia_dstaddr = ifra->ifra_dstaddr;
+                       maskIsNew  = 1; /* We lie; but the effect's the same */
+               }
+               if (ifra->ifra_addr.sin_family == AF_INET &&
+                   (hostIsNew || maskIsNew))
+                       error = in_ifinit(ifp, ia, &ifra->ifra_addr, 0);
+               if ((ifp->if_flags & IFF_BROADCAST) &&
+                   (ifra->ifra_broadaddr.sin_family == AF_INET))
+                       ia->ia_broadaddr = ifra->ifra_broadaddr;
+               return (error);
+
+       case SIOCDIFADDR:
+               in_ifscrub(ifp, ia);
+               if ((ifa = ifp->if_addrlist) == (struct ifaddr *)ia)
+                       ifp->if_addrlist = ifa->ifa_next;
+               else {
+                       while (ifa->ifa_next &&
+                              (ifa->ifa_next != (struct ifaddr *)ia))
+                                   ifa = ifa->ifa_next;
+                       if (ifa->ifa_next)
+                               ifa->ifa_next = ((struct ifaddr *)ia)->ifa_next;
+                       else
+                               printf("Couldn't unlink inifaddr from ifp\n");
+               }
+               oia = ia;
+               if (oia == (ia = in_ifaddr))
+                       in_ifaddr = ia->ia_next;
+               else {
+                       while (ia->ia_next && (ia->ia_next != oia))
+                               ia = ia->ia_next;
+                       if (ia->ia_next)
+                               ia->ia_next = oia->ia_next;
+                       else
+                               printf("Didn't unlink inifadr from list\n");
+               }
+               (void) m_free(dtom(oia));

                break;
 
        default:
                break;
 
        default:


@@ -267,33 +434,53 @@ in_control(so, cmd, data, ifp)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Delete any existing route for an interface.
+ */
+in_ifscrub(ifp, ia)
+       register struct ifnet *ifp;
+       register struct in_ifaddr *ia;
+{
+
+       if ((ia->ia_flags & IFA_ROUTE) == 0)
+               return;
+       if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
+               rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
+       else
+               rtinit(&(ia->ia_ifa), (int)RTM_DELETE, 0);
+       ia->ia_flags &= ~IFA_ROUTE;
+}
+

 /*
  * Initialize an interface's internet address
  * and routing table entry.
  */
 /*
  * Initialize an interface's internet address
  * and routing table entry.
  */

-in_ifinit(ifp, ia, sin)
+in_ifinit(ifp, ia, sin, scrub)

        register struct ifnet *ifp;
        register struct in_ifaddr *ia;
        struct sockaddr_in *sin;
 {
        register u_long i = ntohl(sin->sin_addr.s_addr);
        register struct ifnet *ifp;
        register struct in_ifaddr *ia;
        struct sockaddr_in *sin;
 {
        register u_long i = ntohl(sin->sin_addr.s_addr);

-       struct sockaddr_in netaddr;
+       struct sockaddr_in oldaddr;

        int s = splimp(), error;
 
        int s = splimp(), error;
 

-       bzero((caddr_t)&netaddr, sizeof (netaddr));
-       netaddr.sin_family = AF_INET;
+       oldaddr = ia->ia_addr;
+       ia->ia_addr = *sin;

        /*
        /*

-        * Delete any previous route for an old address.
+        * Give the interface a chance to initialize
+        * if this is its first address,
+        * and to validate the address if necessary.

         */
         */

-       if (ia->ia_flags & IFA_ROUTE) {
-               if ((ifp->if_flags & IFF_POINTOPOINT) == 0) {
-                   netaddr.sin_addr = in_makeaddr(ia->ia_subnet, INADDR_ANY);
-                   rtinit((struct sockaddr *)&netaddr, &ia->ia_addr, -1);
-               } else
-                   rtinit((struct sockaddr *)&ia->ia_dstaddr, &ia->ia_addr, -1);
-               ia->ia_flags &= ~IFA_ROUTE;
+       if (ifp->if_ioctl && (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, ia))) {
+               splx(s);
+               ia->ia_addr = oldaddr;
+               return (error);
+       }
+       if (scrub) {
+               ia->ia_ifa.ifa_addr = (struct sockaddr *)&oldaddr;
+               in_ifscrub(ifp, ia);
+               ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;

        }
        }

-       ia->ia_addr = *(struct sockaddr *)sin;

        if (IN_CLASSA(i))
                ia->ia_netmask = IN_CLASSA_NET;
        else if (IN_CLASSB(i))
        if (IN_CLASSA(i))
                ia->ia_netmask = IN_CLASSA_NET;
        else if (IN_CLASSB(i))


@@ -307,33 +494,38 @@ in_ifinit(ifp, ia, sin)
         */
        ia->ia_subnetmask |= ia->ia_netmask;
        ia->ia_subnet = i & ia->ia_subnetmask;
         */
        ia->ia_subnetmask |= ia->ia_netmask;
        ia->ia_subnet = i & ia->ia_subnetmask;

+       ia->ia_sockmask.sin_addr.s_addr = htonl(ia->ia_subnetmask);
+       {
+               register char *cp = (char *) (1 + &(ia->ia_sockmask.sin_addr));
+               register char *cpbase = (char *) &(ia->ia_sockmask.sin_addr);
+               while (--cp >= cpbase)
+                       if (*cp) {
+                               ia->ia_sockmask.sin_len =
+                                       1 + cp - (char *) &(ia->ia_sockmask);
+                               break;
+                       }
+       }

        if (ifp->if_flags & IFF_BROADCAST) {
        if (ifp->if_flags & IFF_BROADCAST) {

-               ia->ia_broadaddr.sa_family = AF_INET;
-               ((struct sockaddr_in *)(&ia->ia_broadaddr))->sin_addr =
+               ia->ia_broadaddr.sin_addr = 

                        in_makeaddr(ia->ia_subnet, INADDR_BROADCAST);
                        in_makeaddr(ia->ia_subnet, INADDR_BROADCAST);

+               ia->ia_netbroadcast.s_addr =
+                   htonl(ia->ia_net | (INADDR_BROADCAST &~ ia->ia_netmask));

        }
        }

-
-       /*
-        * Give the interface a chance to initialize
-        * if this is its first address,
-        * and to validate the address if necessary.
-        */
-       if (ifp->if_ioctl && (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, ia))) {
-               splx(s);
-               bzero((caddr_t)&ia->ia_addr, sizeof(ia->ia_addr));
-               return (error);
-       }
-       splx(s);

        /*
         * Add route for the network.
         */
        /*
         * Add route for the network.
         */

-       if ((ifp->if_flags & IFF_POINTOPOINT) == 0) {
-               netaddr.sin_addr = in_makeaddr(ia->ia_subnet, INADDR_ANY);
-               rtinit((struct sockaddr *)&netaddr, &ia->ia_addr, RTF_UP);
-       } else
-               rtinit((struct sockaddr *)&ia->ia_dstaddr, &ia->ia_addr,
-                       RTF_HOST|RTF_UP);
+       if (ifp->if_flags & IFF_LOOPBACK) {
+               ia->ia_ifa.ifa_dstaddr = ia->ia_ifa.ifa_addr;
+               rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
+       } else if (ifp->if_flags & IFF_POINTOPOINT &&
+                ia->ia_dstaddr.sin_family == AF_INET)
+               rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_HOST|RTF_UP);
+       else {
+               rtinit(&(ia->ia_ifa), (int)RTM_ADD, RTF_UP);
+       }

        ia->ia_flags |= IFA_ROUTE;
        ia->ia_flags |= IFA_ROUTE;

+       splx(s);
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -352,21 +544,30 @@ in_iaonnetof(net)
 }
 
 /*
 }
 
 /*

- * Return 1 if the address is a local broadcast address.
+ * Return 1 if the address might be a local broadcast address.

  */
 in_broadcast(in)
        struct in_addr in;
 {
        register struct in_ifaddr *ia;
  */
 in_broadcast(in)
        struct in_addr in;
 {
        register struct in_ifaddr *ia;

+       u_long t;

 
        /*
         * Look through the list of addresses for a match
         * with a broadcast address.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)
 
        /*
         * Look through the list of addresses for a match
         * with a broadcast address.
         */
        for (ia = in_ifaddr; ia; ia = ia->ia_next)

-           if (((struct sockaddr_in *)&ia->ia_broadaddr)->sin_addr.s_addr ==
-               in.s_addr && (ia->ia_ifp->if_flags & IFF_BROADCAST))
+           if (ia->ia_ifp->if_flags & IFF_BROADCAST) {
+               if (ia->ia_broadaddr.sin_addr.s_addr == in.s_addr)

                     return (1);
                     return (1);

+               /*
+                * Check for old-style (host 0) broadcast.
+                */
+               if ((t = ntohl(in.s_addr)) == ia->ia_subnet || t == ia->ia_net)
+                   return (1);
+       }
+       if (in.s_addr == INADDR_BROADCAST || in.s_addr == INADDR_ANY)
+               return (1);

        return (0);
 }
 #endif
        return (0);
 }
 #endif