BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / net / if.c

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index 6b22145..dc395f5 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,25 +1,62 @@
-/*     if.c    4.28    83/05/27        */
+/*
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)if.c        7.14 (Berkeley) 4/20/91
+ */
+
+#include "param.h"
+#include "mbuf.h"
+#include "systm.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "protosw.h"
+#include "proc.h"
+#include "kernel.h"
+#include "ioctl.h"

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/socket.h"
-#include "../h/protosw.h"
-#include "../h/time.h"
-#include "../h/kernel.h"
-#include "../h/ioctl.h"
-#include "../h/errno.h"
+#include "if.h"
+#include "af.h"
+#include "if_dl.h"
+#include "if_types.h"

 
 

-#include "../net/if.h"
-#include "../net/af.h"
+#include "ether.h"

 
 int    ifqmaxlen = IFQ_MAXLEN;
 
 /*
  * Network interface utility routines.
  *
 
 int    ifqmaxlen = IFQ_MAXLEN;
 
 /*
  * Network interface utility routines.
  *

- * Routines with if_ifwith* names take sockaddr *'s as
- * parameters.  Other routines take value parameters,
- * e.g. if_ifwithnet takes the network number.
+ * Routines with ifa_ifwith* names take sockaddr *'s as
+ * parameters.

  */
 
 ifinit()
  */
 
 ifinit()


@@ -27,15 +64,12 @@ ifinit()
        register struct ifnet *ifp;
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
        register struct ifnet *ifp;
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)

-               if (ifp->if_init) {
-                       (*ifp->if_init)(ifp->if_unit);
-                       if (ifp->if_snd.ifq_maxlen == 0)
-                               ifp->if_snd.ifq_maxlen = ifqmaxlen;
-               }
+               if (ifp->if_snd.ifq_maxlen == 0)
+                       ifp->if_snd.ifq_maxlen = ifqmaxlen;

        if_slowtimo();
 }
 
        if_slowtimo();
 }
 

-#if vax
+#ifdef vax

 /*
  * Call each interface on a Unibus reset.
  */
 /*
  * Call each interface on a Unibus reset.
  */


@@ -46,10 +80,14 @@ ifubareset(uban)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
                if (ifp->if_reset)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
                if (ifp->if_reset)

-                       (*ifp->if_reset)(uban);
+                       (*ifp->if_reset)(ifp->if_unit, uban);

 }
 #endif
 
 }
 #endif
 

+int if_index = 0;
+struct ifaddr **ifnet_addrs;
+static char *sprint_d();
+

 /*
  * Attach an interface to the
  * list of "active" interfaces.
 /*
  * Attach an interface to the
  * list of "active" interfaces.


@@ -57,89 +95,235 @@ ifubareset(uban)
 if_attach(ifp)
        struct ifnet *ifp;
 {
 if_attach(ifp)
        struct ifnet *ifp;
 {

+       unsigned socksize, ifasize;
+       int namelen, unitlen;
+       char workbuf[12], *unitname;

        register struct ifnet **p = &ifnet;
        register struct ifnet **p = &ifnet;

+       register struct sockaddr_dl *sdl;
+       register struct ifaddr *ifa;
+       static int if_indexlim = 8;
+       extern link_rtrequest(), ether_output();

 
        while (*p)
                p = &((*p)->if_next);
        *p = ifp;
 
        while (*p)
                p = &((*p)->if_next);
        *p = ifp;

+       ifp->if_index = ++if_index;
+       if (ifnet_addrs == 0 || if_index >= if_indexlim) {
+               unsigned n = (if_indexlim <<= 1) * sizeof(ifa);
+               struct ifaddr **q = (struct ifaddr **)
+                                       malloc(n, M_IFADDR, M_WAITOK);
+               if (ifnet_addrs) {
+                       bcopy((caddr_t)ifnet_addrs, (caddr_t)q, n/2);
+                       free((caddr_t)ifnet_addrs, M_IFADDR);
+               }
+               ifnet_addrs = q;
+       }
+       /* XXX -- Temporary fix before changing 10 ethernet drivers */
+       if (ifp->if_output == ether_output) {
+               ifp->if_type = IFT_ETHER;
+               ifp->if_addrlen = 6;
+               ifp->if_hdrlen = 14;
+       }
+       /*
+        * create a Link Level name for this device
+        */
+       unitname = sprint_d((u_int)ifp->if_unit, workbuf, sizeof(workbuf));
+       namelen = strlen(ifp->if_name);
+       unitlen = strlen(unitname);
+#define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
+       socksize = _offsetof(struct sockaddr_dl, sdl_data[0]) +
+                              unitlen + namelen + ifp->if_addrlen;
+#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1)))
+       socksize = ROUNDUP(socksize);
+       if (socksize < sizeof(*sdl))
+               socksize = sizeof(*sdl);
+       ifasize = sizeof(*ifa) + 2 * socksize;
+       ifa = (struct ifaddr *)malloc(ifasize, M_IFADDR, M_WAITOK);
+       if (ifa == 0)
+               return;
+       ifnet_addrs[if_index - 1] = ifa;
+       bzero((caddr_t)ifa, ifasize);
+       sdl = (struct sockaddr_dl *)(ifa + 1);
+       ifa->ifa_addr = (struct sockaddr *)sdl;
+       ifa->ifa_ifp = ifp;
+       sdl->sdl_len = socksize;
+       sdl->sdl_family = AF_LINK;
+       bcopy(ifp->if_name, sdl->sdl_data, namelen);
+       bcopy(unitname, namelen + (caddr_t)sdl->sdl_data, unitlen);
+       sdl->sdl_nlen = (namelen += unitlen);
+       sdl->sdl_index = ifp->if_index;
+       sdl = (struct sockaddr_dl *)(socksize + (caddr_t)sdl);
+       ifa->ifa_netmask = (struct sockaddr *)sdl;
+       sdl->sdl_len = socksize - ifp->if_addrlen;
+       while (namelen != 0)
+               sdl->sdl_data[--namelen] = 0xff;
+       ifa->ifa_next = ifp->if_addrlist;
+       ifa->ifa_rtrequest = link_rtrequest;
+       ifp->if_addrlist = ifa;

 }
 }

-

 /*
  * Locate an interface based on a complete address.
  */
 /*ARGSUSED*/
 /*
  * Locate an interface based on a complete address.
  */
 /*ARGSUSED*/

-struct ifnet *
-if_ifwithaddr(addr)
-       struct sockaddr *addr;
+struct ifaddr *
+ifa_ifwithaddr(addr)
+       register struct sockaddr *addr;

 {
        register struct ifnet *ifp;
 {
        register struct ifnet *ifp;

+       register struct ifaddr *ifa;

 
 #define        equal(a1, a2) \
 
 #define        equal(a1, a2) \

-       (bcmp((caddr_t)((a1)->sa_data), (caddr_t)((a2)->sa_data), 14) == 0)
-       for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-               if (ifp->if_addr.sa_family != addr->sa_family)
+  (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
+       for (ifp = ifnet; ifp; ifp = ifp->if_next)
+           for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+               if (ifa->ifa_addr->sa_family != addr->sa_family)

                        continue;
                        continue;

-               if (equal(&ifp->if_addr, addr))
-                       break;
-               if ((ifp->if_flags & IFF_BROADCAST) &&
-                   equal(&ifp->if_broadaddr, addr))
-                       break;
+               if (equal(addr, ifa->ifa_addr))
+                       return (ifa);
+               if ((ifp->if_flags & IFF_BROADCAST) && ifa->ifa_broadaddr &&
+                   equal(ifa->ifa_broadaddr, addr))
+                       return (ifa);

        }
        }

-       return (ifp);
+       return ((struct ifaddr *)0);
+}
+/*
+ * Locate the point to point interface with a given destination address.
+ */
+/*ARGSUSED*/
+struct ifaddr *
+ifa_ifwithdstaddr(addr)
+       register struct sockaddr *addr;
+{
+       register struct ifnet *ifp;
+       register struct ifaddr *ifa;
+
+       for (ifp = ifnet; ifp; ifp = ifp->if_next) 
+           if (ifp->if_flags & IFF_POINTOPOINT)
+               for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+                       if (ifa->ifa_addr->sa_family != addr->sa_family)
+                               continue;
+                       if (equal(addr, ifa->ifa_dstaddr))
+                               return (ifa);
+       }
+       return ((struct ifaddr *)0);

 }
 
 /*
  * Find an interface on a specific network.  If many, choice
  * is first found.
  */
 }
 
 /*
  * Find an interface on a specific network.  If many, choice
  * is first found.
  */

-struct ifnet *
-if_ifwithnet(addr)
-       register struct sockaddr *addr;
+struct ifaddr *
+ifa_ifwithnet(addr)
+       struct sockaddr *addr;

 {
        register struct ifnet *ifp;
 {
        register struct ifnet *ifp;

-       register u_int af = addr->sa_family;
-       register int (*netmatch)();
+       register struct ifaddr *ifa;
+       u_int af = addr->sa_family;

 
        if (af >= AF_MAX)
                return (0);
 
        if (af >= AF_MAX)
                return (0);

-       netmatch = afswitch[af].af_netmatch;
-       for (ifp = ifnet; ifp; ifp = ifp->if_next) {
-               if (af != ifp->if_addr.sa_family)
-                       continue;
-               if ((*netmatch)(addr, &ifp->if_addr))
-                       break;
+       if (af == AF_LINK) {
+           register struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
+           if (sdl->sdl_index && sdl->sdl_index <= if_index)
+               return (ifnet_addrs[sdl->sdl_index - 1]);

        }
        }

-       return (ifp);
+       for (ifp = ifnet; ifp; ifp = ifp->if_next)
+           for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+               register char *cp, *cp2, *cp3;
+               register char *cplim;
+               if (ifa->ifa_addr->sa_family != af || ifa->ifa_netmask == 0)
+                       continue;
+               cp = addr->sa_data;
+               cp2 = ifa->ifa_addr->sa_data;
+               cp3 = ifa->ifa_netmask->sa_data;
+               cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
+               for (; cp3 < cplim; cp3++)
+                       if ((*cp++ ^ *cp2++) & *cp3)
+                               break;
+               if (cp3 == cplim)
+                       return (ifa);
+           }
+       return ((struct ifaddr *)0);

 }
 
 /*
 }
 
 /*

- * As above, but parameter is network number.
+ * Find an interface using a specific address family

  */
  */

-struct ifnet *
-if_ifonnetof(net)
-       register int net;
+struct ifaddr *
+ifa_ifwithaf(af)
+       register int af;

 {
        register struct ifnet *ifp;
 {
        register struct ifnet *ifp;

+       register struct ifaddr *ifa;

 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)

-               if (ifp->if_net == net)
-                       break;
-       return (ifp);
+           for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
+               if (ifa->ifa_addr->sa_family == af)
+                       return (ifa);
+       return ((struct ifaddr *)0);

 }
 
 /*
 }
 
 /*

- * Find an interface using a specific address family
+ * Find an interface address specific to an interface best matching
+ * a given address.

  */
  */

-struct ifnet *
-if_ifwithaf(af)
-       register int af;
-{
+struct ifaddr *
+ifaof_ifpforaddr(addr, ifp)
+       struct sockaddr *addr;

        register struct ifnet *ifp;
        register struct ifnet *ifp;

+{
+       register struct ifaddr *ifa;
+       register char *cp, *cp2, *cp3;
+       register char *cplim;
+       struct ifaddr *ifa_maybe = 0;
+       u_int af = addr->sa_family;

 
 

-       for (ifp = ifnet; ifp; ifp = ifp->if_next)
-               if (ifp->if_addr.sa_family == af)
-                       break;
-       return (ifp);
+       if (af >= AF_MAX)
+               return (0);
+       for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+               if (ifa->ifa_addr->sa_family != af)
+                       continue;
+               ifa_maybe = ifa;
+               if (ifa->ifa_netmask == 0) {
+                       if (equal(addr, ifa->ifa_addr) ||
+                           (ifa->ifa_dstaddr && equal(addr, ifa->ifa_dstaddr)))
+                               return (ifa);
+                       continue;
+               }
+               cp = addr->sa_data;
+               cp2 = ifa->ifa_addr->sa_data;
+               cp3 = ifa->ifa_netmask->sa_data;
+               cplim = ifa->ifa_netmask->sa_len + (char *)ifa->ifa_netmask;
+               for (; cp3 < cplim; cp3++)
+                       if ((*cp++ ^ *cp2++) & *cp3)
+                               break;
+               if (cp3 == cplim)
+                       return (ifa);
+       }
+       return (ifa_maybe);
+}
+#include "route.h"
+/*
+ * Default action when installing a route with a Link Level gateway.
+ * Lookup an appropriate real ifa to point to.
+ * This should be moved to /sys/net/link.c eventually.
+ */
+link_rtrequest(cmd, rt, sa)
+register struct rtentry *rt;
+struct sockaddr *sa;
+{
+       register struct ifaddr *ifa;
+       struct sockaddr *dst;
+       struct ifnet *ifp, *oldifnet = ifnet;
+
+       if (cmd != RTM_ADD || ((ifa = rt->rt_ifa) == 0) ||
+           ((ifp = ifa->ifa_ifp) == 0) || ((dst = rt_key(rt)) == 0))
+               return;
+       if (ifa = ifaof_ifpforaddr(dst, ifp)) {
+               rt->rt_ifa = ifa;
+               if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest)
+                       ifa->ifa_rtrequest(cmd, rt, sa);
+       }

 }
 
 /*
 }
 
 /*


@@ -150,9 +334,30 @@ if_ifwithaf(af)
 if_down(ifp)
        register struct ifnet *ifp;
 {
 if_down(ifp)
        register struct ifnet *ifp;
 {

+       register struct ifaddr *ifa;

 
        ifp->if_flags &= ~IFF_UP;
 
        ifp->if_flags &= ~IFF_UP;

-       pfctlinput(PRC_IFDOWN, (caddr_t)&ifp->if_addr);
+       for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
+               pfctlinput(PRC_IFDOWN, ifa->ifa_addr);
+       if_qflush(&ifp->if_snd);
+}
+
+/*
+ * Flush an interface queue.
+ */
+if_qflush(ifq)
+       register struct ifqueue *ifq;
+{
+       register struct mbuf *m, *n;
+
+       n = ifq->ifq_head;
+       while (m = n) {
+               n = m->m_act;
+               m_freem(m);
+       }
+       ifq->ifq_head = 0;
+       ifq->ifq_tail = 0;
+       ifq->ifq_len = 0;

 }
 
 /*
 }
 
 /*


@@ -163,6 +368,7 @@ if_down(ifp)
 if_slowtimo()
 {
        register struct ifnet *ifp;
 if_slowtimo()
 {
        register struct ifnet *ifp;

+       int s = splimp();

 
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if (ifp->if_timer == 0 || --ifp->if_timer)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if (ifp->if_timer == 0 || --ifp->if_timer)


@@ -170,83 +376,171 @@ if_slowtimo()
                if (ifp->if_watchdog)
                        (*ifp->if_watchdog)(ifp->if_unit);
        }
                if (ifp->if_watchdog)
                        (*ifp->if_watchdog)(ifp->if_unit);
        }

+       splx(s);

        timeout(if_slowtimo, (caddr_t)0, hz / IFNET_SLOWHZ);
 }
 
 /*
        timeout(if_slowtimo, (caddr_t)0, hz / IFNET_SLOWHZ);
 }
 
 /*

- * Service a socket ioctl request directed
- * to an interface.
+ * Map interface name to
+ * interface structure pointer.

  */
  */

-ifrequest(cmd, data)
-       int cmd;
-       caddr_t data;
+struct ifnet *
+ifunit(name)
+       register char *name;

 {
 {

-       register struct ifnet *ifp;
-       register struct ifreq *ifr;

        register char *cp;
        register char *cp;

-       int unit, s;
+       register struct ifnet *ifp;
+       int unit;
+       unsigned len;
+       char *ep, c;

 
 

-       ifr = (struct ifreq *)data;
-       for (cp = ifr->ifr_name; *cp; cp++)
+       for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)

                if (*cp >= '0' && *cp <= '9')
                        break;
                if (*cp >= '0' && *cp <= '9')
                        break;

-       if (*cp == 0)
-               return (ENXIO);         /* couldn't find unit */
-       unit = *cp - '0', *cp = 0;
+       if (*cp == '\0' || cp == name + IFNAMSIZ)
+               return ((struct ifnet *)0);
+       /*
+        * Save first char of unit, and pointer to it,
+        * so we can put a null there to avoid matching
+        * initial substrings of interface names.
+        */
+       len = cp - name + 1;
+       c = *cp;
+       ep = cp;
+       for (unit = 0; *cp >= '0' && *cp <= '9'; )
+               unit = unit * 10 + *cp++ - '0';
+       *ep = 0;

        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {

-               if (bcmp(ifp->if_name, ifr->ifr_name,
-                   (unsigned)(cp - ifr->ifr_name)))
+               if (bcmp(ifp->if_name, name, len))

                        continue;
                if (unit == ifp->if_unit)
                        continue;
                if (unit == ifp->if_unit)

-                       goto found;
+                       break;

        }
        }

-       return (ENXIO);
-
-found:
-       switch (cmd) {
-
-       case SIOCGIFADDR:
-               ifr->ifr_addr = ifp->if_addr;
-               break;
+       *ep = c;
+       return (ifp);
+}

 
 

-       case SIOCSIFADDR:
-               if_rtinit(ifp, -1);     /* delete previous route */
-               s = splimp();
-               ifp->if_addr = ifr->ifr_addr;
-               (*ifp->if_init)(unit);
-               splx(s);
-               break;
+/*
+ * Interface ioctls.
+ */
+ifioctl(so, cmd, data, p)
+       struct socket *so;
+       int cmd;
+       caddr_t data;
+       struct proc *p;
+{
+       register struct ifnet *ifp;
+       register struct ifreq *ifr;
+       int error;

 
 

-       case SIOCGIFDSTADDR:
-               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-                       return (EINVAL);
-               ifr->ifr_dstaddr = ifp->if_dstaddr;
-               break;
+       switch (cmd) {

 
 

-       case SIOCSIFDSTADDR:
-               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-                       return (EINVAL);
-               s = splimp();
-               ifp->if_dstaddr = ifr->ifr_dstaddr;
-               splx(s);
-               break;
+       case SIOCGIFCONF:
+       case OSIOCGIFCONF:
+               return (ifconf(cmd, data));
+
+#if defined(INET) && NETHER > 0
+       case SIOCSARP:
+       case SIOCDARP:
+               if (error = suser(p->p_ucred, &p->p_acflag))
+                       return (error);
+               /* FALL THROUGH */
+       case SIOCGARP:
+       case OSIOCGARP:
+               return (arpioctl(cmd, data));
+#endif
+       }
+       ifr = (struct ifreq *)data;
+       ifp = ifunit(ifr->ifr_name);
+       if (ifp == 0)
+               return (ENXIO);
+       switch (cmd) {

 
        case SIOCGIFFLAGS:
                ifr->ifr_flags = ifp->if_flags;
                break;
 
 
        case SIOCGIFFLAGS:
                ifr->ifr_flags = ifp->if_flags;
                break;
 

+       case SIOCGIFMETRIC:
+               ifr->ifr_metric = ifp->if_metric;
+               break;
+

        case SIOCSIFFLAGS:
        case SIOCSIFFLAGS:

-               if ((ifr->ifr_flags & IFF_UP) == 0 &&
-                   (ifp->if_flags & IFF_UP)) {
-                       s = splimp();
+               if (error = suser(p->p_ucred, &p->p_acflag))
+                       return (error);
+               if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
+                       int s = splimp();

                        if_down(ifp);
                        splx(s);
                }
                        if_down(ifp);
                        splx(s);
                }

-               ifp->if_flags = ifr->ifr_flags;
+               ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
+                       (ifr->ifr_flags &~ IFF_CANTCHANGE);
+               if (ifp->if_ioctl)
+                       (void) (*ifp->if_ioctl)(ifp, cmd, data);
+               break;
+
+       case SIOCSIFMETRIC:
+               if (error = suser(p->p_ucred, &p->p_acflag))
+                       return (error);
+               ifp->if_metric = ifr->ifr_metric;

                break;
 
        default:
                break;
 
        default:

-               return (EINVAL);
+               if (so->so_proto == 0)
+                       return (EOPNOTSUPP);
+#ifndef COMPAT_43
+               return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
+                       cmd, data, ifp));
+#else
+           {
+               int ocmd = cmd;
+
+               switch (cmd) {
+
+               case SIOCSIFDSTADDR:
+               case SIOCSIFADDR:
+               case SIOCSIFBRDADDR:
+               case SIOCSIFNETMASK:
+#if BYTE_ORDER != BIG_ENDIAN
+                       if (ifr->ifr_addr.sa_family == 0 &&
+                           ifr->ifr_addr.sa_len < 16) {
+                               ifr->ifr_addr.sa_family = ifr->ifr_addr.sa_len;
+                               ifr->ifr_addr.sa_len = 16;
+                       }
+#else
+                       if (ifr->ifr_addr.sa_len == 0)
+                               ifr->ifr_addr.sa_len = 16;
+#endif
+                       break;
+
+               case OSIOCGIFADDR:
+                       cmd = SIOCGIFADDR;
+                       break;
+
+               case OSIOCGIFDSTADDR:
+                       cmd = SIOCGIFDSTADDR;
+                       break;
+
+               case OSIOCGIFBRDADDR:
+                       cmd = SIOCGIFBRDADDR;
+                       break;
+
+               case OSIOCGIFNETMASK:
+                       cmd = SIOCGIFNETMASK;
+               }
+               error =  ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
+                                                           cmd, data, ifp));
+               switch (ocmd) {
+
+               case OSIOCGIFADDR:
+               case OSIOCGIFDSTADDR:
+               case OSIOCGIFBRDADDR:
+               case OSIOCGIFNETMASK:
+                       *(u_short *)&ifr->ifr_addr = ifr->ifr_addr.sa_family;
+               }
+               return (error);
+
+           }
+#endif

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


@@ -264,6 +558,7 @@ ifconf(cmd, data)
 {
        register struct ifconf *ifc = (struct ifconf *)data;
        register struct ifnet *ifp = ifnet;
 {
        register struct ifconf *ifc = (struct ifconf *)data;
        register struct ifnet *ifp = ifnet;

+       register struct ifaddr *ifa;

        register char *cp, *ep;
        struct ifreq ifr, *ifrp;
        int space = ifc->ifc_len, error = 0;
        register char *cp, *ep;
        struct ifreq ifr, *ifrp;
        int space = ifc->ifc_len, error = 0;


@@ -275,12 +570,65 @@ ifconf(cmd, data)
                for (cp = ifr.ifr_name; cp < ep && *cp; cp++)
                        ;
                *cp++ = '0' + ifp->if_unit; *cp = '\0';
                for (cp = ifr.ifr_name; cp < ep && *cp; cp++)
                        ;
                *cp++ = '0' + ifp->if_unit; *cp = '\0';

-               ifr.ifr_addr = ifp->if_addr;
-               error = copyout((caddr_t)&ifr, (caddr_t)ifrp, sizeof (ifr));
-               if (error)
-                       break;
-               space -= sizeof (ifr), ifrp++;
+               if ((ifa = ifp->if_addrlist) == 0) {
+                       bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
+                       error = copyout((caddr_t)&ifr, (caddr_t)ifrp, sizeof (ifr));
+                       if (error)
+                               break;
+                       space -= sizeof (ifr), ifrp++;
+               } else 
+                   for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
+                       register struct sockaddr *sa = ifa->ifa_addr;
+#ifdef COMPAT_43
+                       if (cmd == OSIOCGIFCONF) {
+                               struct osockaddr *osa =
+                                        (struct osockaddr *)&ifr.ifr_addr;
+                               ifr.ifr_addr = *sa;
+                               osa->sa_family = sa->sa_family;
+                               error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
+                                               sizeof (ifr));
+                               ifrp++;
+                       } else
+#endif
+                       if (sa->sa_len <= sizeof(*sa)) {
+                               ifr.ifr_addr = *sa;
+                               error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
+                                               sizeof (ifr));
+                               ifrp++;
+                       } else {
+                               space -= sa->sa_len - sizeof(*sa);
+                               if (space < sizeof (ifr))
+                                       break;
+                               error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
+                                               sizeof (ifr.ifr_name));
+                               if (error == 0)
+                                   error = copyout((caddr_t)sa,
+                                     (caddr_t)&ifrp->ifr_addr, sa->sa_len);
+                               ifrp = (struct ifreq *)
+                                       (sa->sa_len + (caddr_t)&ifrp->ifr_addr);
+                       }
+                       if (error)
+                               break;
+                       space -= sizeof (ifr);
+               }

        }
        ifc->ifc_len -= space;
        return (error);
 }
        }
        ifc->ifc_len -= space;
        return (error);
 }

+
+static char *
+sprint_d(n, buf, buflen)
+       u_int n;
+       char *buf;
+       int buflen;
+{
+       register char *cp = buf + buflen - 1;
+
+       *cp = 0;
+       do {
+               cp--;
+               *cp = "0123456789"[n % 10];
+               n /= 10;
+       } while (n != 0);
+       return (cp);
+}