../machine => machine

[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 c9026c4..a265280 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,12 +1,24 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)if.c        6.10 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)if.c        7.6.1.1 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"

+#include "mbuf.h"

 #include "systm.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "systm.h"
 #include "socket.h"
 #include "socketvar.h"


@@ -76,18 +88,18 @@ if_attach(ifp)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithaddr(addr)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithaddr(addr)

-       struct sockaddr *addr;
+       register struct sockaddr *addr;

 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
 
 #define        equal(a1, a2) \
 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
 
 #define        equal(a1, a2) \

-       (bcmp((caddr_t)((a1)->sa_data), (caddr_t)((a2)->sa_data), 14) == 0)
+  (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) {
        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)
+               if (ifa->ifa_addr->sa_family != addr->sa_family)

                        continue;
                        continue;

-               if (equal(&ifa->ifa_addr, addr))
+               if (equal(addr, ifa->ifa_addr))

                        return (ifa);
                if ((ifp->if_flags & IFF_BROADCAST) &&
                    equal(&ifa->ifa_broadaddr, addr))
                        return (ifa);
                if ((ifp->if_flags & IFF_BROADCAST) &&
                    equal(&ifa->ifa_broadaddr, addr))


@@ -101,7 +113,7 @@ ifa_ifwithaddr(addr)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithdstaddr(addr)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithdstaddr(addr)

-       struct sockaddr *addr;
+       register struct sockaddr *addr;

 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;


@@ -109,9 +121,9 @@ ifa_ifwithdstaddr(addr)
        for (ifp = ifnet; ifp; ifp = ifp->if_next) 
            if (ifp->if_flags & IFF_POINTOPOINT)
                for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
        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)
+                       if (ifa->ifa_addr->sa_family != addr->sa_family)

                                continue;
                                continue;

-                       if (equal(&ifa->ifa_dstaddr, addr))
+                       if (equal(addr, ifa->ifa_dstaddr))

                                return (ifa);
        }
        return ((struct ifaddr *)0);
                                return (ifa);
        }
        return ((struct ifaddr *)0);


@@ -123,26 +135,34 @@ ifa_ifwithdstaddr(addr)
  */
 struct ifaddr *
 ifa_ifwithnet(addr)
  */
 struct ifaddr *
 ifa_ifwithnet(addr)

-       register struct sockaddr *addr;
+       struct sockaddr *addr;

 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;
 {
        register struct ifnet *ifp;
        register struct ifaddr *ifa;

-       register u_int af = addr->sa_family;
-       register int (*netmatch)();
+       register char *cp, *cp2, *cp3;
+       register char *cplim;
+       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)
            for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
        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)
+               if (ifa->ifa_addr->sa_family != af || ifa->ifa_netmask == 0)

                        continue;
                        continue;

-               if ((*netmatch)(&ifa->ifa_addr, addr))
+               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);

-       }
+           }

        return ((struct ifaddr *)0);
 }
 
        return ((struct ifaddr *)0);
 }
 

+#ifdef notdef

 /*
  * Find an interface using a specific address family
  */
 /*
  * Find an interface using a specific address family
  */


@@ -155,10 +175,11 @@ ifa_ifwithaf(af)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
            for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
 
        for (ifp = ifnet; ifp; ifp = ifp->if_next)
            for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)

-               if (ifa->ifa_addr.sa_family == af)
+               if (ifa->ifa_addr->sa_family == af)

                        return (ifa);
        return ((struct ifaddr *)0);
 }
                        return (ifa);
        return ((struct ifaddr *)0);
 }

+#endif

 
 /*
  * Mark an interface down and notify protocols of
 
 /*
  * Mark an interface down and notify protocols of


@@ -172,7 +193,26 @@ if_down(ifp)
 
        ifp->if_flags &= ~IFF_UP;
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
 
        ifp->if_flags &= ~IFF_UP;
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)

-               pfctlinput(PRC_IFDOWN, &ifa->ifa_addr);
+               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;

 }
 
 /*
 }
 
 /*


@@ -183,6 +223,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)


@@ -190,6 +231,7 @@ 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);
 }
 


@@ -204,19 +246,32 @@ ifunit(name)
        register char *cp;
        register struct ifnet *ifp;
        int unit;
        register char *cp;
        register struct ifnet *ifp;
        int unit;

+       unsigned len;
+       char *ep, c;

 
        for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)
                if (*cp >= '0' && *cp <= '9')
                        break;
        if (*cp == '\0' || cp == name + IFNAMSIZ)
                return ((struct ifnet *)0);
 
        for (cp = name; cp < name + IFNAMSIZ && *cp; cp++)
                if (*cp >= '0' && *cp <= '9')
                        break;
        if (*cp == '\0' || cp == name + IFNAMSIZ)
                return ((struct ifnet *)0);

-       unit = *cp - '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, name, (unsigned)(cp - name)))
+               if (bcmp(ifp->if_name, name, len))

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

+       *ep = c;

        return (ifp);
 }
 
        return (ifp);
 }
 


@@ -234,15 +289,17 @@ ifioctl(so, cmd, data)
        switch (cmd) {
 
        case SIOCGIFCONF:
        switch (cmd) {
 
        case SIOCGIFCONF:

+       case OSIOCGIFCONF:

                return (ifconf(cmd, data));
 
                return (ifconf(cmd, data));
 

-#if (defined(INET) || defined(BBNNET)) && NETHER > 0
+#if defined(INET) && NETHER > 0

        case SIOCSARP:
        case SIOCDARP:
                if (!suser())
                        return (u.u_error);
                /* FALL THROUGH */
        case SIOCGARP:
        case SIOCSARP:
        case SIOCDARP:
                if (!suser())
                        return (u.u_error);
                /* FALL THROUGH */
        case SIOCGARP:

+       case OSIOCGARP:

                return (arpioctl(cmd, data));
 #endif
        }
                return (arpioctl(cmd, data));
 #endif
        }


@@ -256,6 +313,10 @@ ifioctl(so, cmd, data)
                ifr->ifr_flags = ifp->if_flags;
                break;
 
                ifr->ifr_flags = ifp->if_flags;
                break;
 

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

        case SIOCSIFFLAGS:
                if (!suser())
                        return (u.u_error);
        case SIOCSIFFLAGS:
                if (!suser())
                        return (u.u_error);


@@ -270,11 +331,69 @@ ifioctl(so, cmd, data)
                        (void) (*ifp->if_ioctl)(ifp, cmd, data);
                break;
 
                        (void) (*ifp->if_ioctl)(ifp, cmd, data);
                break;
 

+       case SIOCSIFMETRIC:
+               if (!suser())
+                       return (u.u_error);
+               ifp->if_metric = ifr->ifr_metric;
+               break;
+

        default:
                if (so->so_proto == 0)
                        return (EOPNOTSUPP);
        default:
                if (so->so_proto == 0)
                        return (EOPNOTSUPP);

+#ifndef COMPAT_43

                return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
                        cmd, data, ifp));
                return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
                        cmd, data, ifp));

+#else
+           {
+               int error, 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);
 }


@@ -312,11 +431,38 @@ ifconf(cmd, data)
                        space -= sizeof (ifr), ifrp++;
                } else 
                    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
                        space -= sizeof (ifr), ifrp++;
                } else 
                    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {

-                       ifr.ifr_addr = ifa->ifa_addr;
-                       error = copyout((caddr_t)&ifr, (caddr_t)ifrp, sizeof (ifr));
+                       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;
                        if (error)
                                break;

-                       space -= sizeof (ifr), ifrp++;
+                       space -= sizeof (ifr);

                }
        }
        ifc->ifc_len -= space;
                }
        }
        ifc->ifc_len -= space;