plug memory leak; check in for ``alpha'' tape

[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 53180d0..160cd37 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,10 +1,28 @@
-/*     if.c    6.6     85/03/19        */
+/*
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.8 (Berkeley) %G%
+ */

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

+#include "mbuf.h"

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

+#include "socketvar.h"

 #include "protosw.h"
 #include "protosw.h"

-#include "dir.h"

 #include "user.h"
 #include "kernel.h"
 #include "ioctl.h"
 #include "user.h"
 #include "kernel.h"
 #include "ioctl.h"


@@ -20,9 +38,8 @@ int   ifqmaxlen = IFQ_MAXLEN;
 /*
  * Network interface utility routines.
  *
 /*
  * 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()


@@ -30,11 +47,8 @@ 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();
 }
 


@@ -71,79 +85,100 @@ if_attach(ifp)
  * 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 (equal(addr, ifa->ifa_addr))
+                       return (ifa);

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

-                   equal(&ifp->if_broadaddr, addr))
-                       break;
+                   equal(&ifa->ifa_broadaddr, addr))
+                       return (ifa);

        }
        }

-       return (ifp);
+       return ((struct ifaddr *)0);

 }
 }

-

 /*
 /*

- * Find an interface on a specific network.  If many, choice
- * is first found.
+ * Locate the point to point interface with a given destination address.

  */
  */

-struct ifnet *
-if_ifwithnet(addr)
+/*ARGSUSED*/
+struct ifaddr *
+ifa_ifwithdstaddr(addr)

        register struct sockaddr *addr;
 {
        register struct ifnet *ifp;
        register struct sockaddr *addr;
 {
        register struct ifnet *ifp;

-       register u_int af = addr->sa_family;
-       register int (*netmatch)();
-
-       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;
+       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 (ifp);
+       return ((struct ifaddr *)0);

 }
 
 /*
 }
 
 /*

- * As above, but parameter is network number.
+ * Find an interface on a specific network.  If many, choice
+ * is first found.

  */
  */

-struct ifnet *
-if_ifonnetof(net)
-       register int net;
+struct ifaddr *
+ifa_ifwithnet(addr)
+       struct sockaddr *addr;

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

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

 
 

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

        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 || 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);

 }
 
 }
 

+#ifdef notdef

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

-struct ifnet *
-if_ifwithaf(af)
+struct ifaddr *
+ifa_ifwithaf(af)

        register int af;
 {
        register struct ifnet *ifp;
        register int af;
 {
        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_addr.sa_family == af)
-                       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);

 }
 }

+#endif

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


@@ -153,9 +188,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;

 }
 
 /*
 }
 
 /*


@@ -166,6 +222,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)


@@ -173,6 +230,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);
 }
 


@@ -187,53 +245,63 @@ 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);
 }
 
 /*
  * Interface ioctls.
  */
        return (ifp);
 }
 
 /*
  * Interface ioctls.
  */

-ifioctl(cmd, data)
+ifioctl(so, cmd, data)
+       struct socket *so;

        int cmd;
        caddr_t data;
 {
        register struct ifnet *ifp;
        register struct ifreq *ifr;
        int cmd;
        caddr_t data;
 {
        register struct ifnet *ifp;
        register struct ifreq *ifr;

+       int error;

 
        switch (cmd) {
 
        case SIOCGIFCONF:
 
        switch (cmd) {
 
        case SIOCGIFCONF:

+       case OSIOCGIFCONF:

                return (ifconf(cmd, data));
 
 #if defined(INET) && NETHER > 0
        case SIOCSARP:
        case SIOCDARP:
                return (ifconf(cmd, data));
 
 #if defined(INET) && NETHER > 0
        case SIOCSARP:
        case SIOCDARP:

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

                /* FALL THROUGH */
        case SIOCGARP:
                /* FALL THROUGH */
        case SIOCGARP:

+       case OSIOCGARP:

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

-
-       case SIOCSIFADDR:
-       case SIOCSIFFLAGS:
-       case SIOCSIFDSTADDR:
-               if (!suser())
-                       return (u.u_error);
-               break;

        }
        ifr = (struct ifreq *)data;
        ifp = ifunit(ifr->ifr_name);
        }
        ifr = (struct ifreq *)data;
        ifp = ifunit(ifr->ifr_name);


@@ -241,33 +309,91 @@ ifioctl(cmd, data)
                return (ENXIO);
        switch (cmd) {
 
                return (ENXIO);
        switch (cmd) {
 

-       case SIOCGIFADDR:
-               ifr->ifr_addr = ifp->if_addr;
-               break;
-
-       case SIOCGIFDSTADDR:
-               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-                       return (EINVAL);
-               ifr->ifr_dstaddr = ifp->if_dstaddr;
-               break;
-

        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 (error = suser(u.u_cred, &u.u_acflag))
+                       return (error);

                if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
                        int s = splimp();
                        if_down(ifp);
                        splx(s);
                }
                if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
                        int s = splimp();
                        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(u.u_cred, &u.u_acflag))
+                       return (error);
+               ifp->if_metric = ifr->ifr_metric;

                break;
 
        default:
                break;
 
        default:

-               if (ifp->if_ioctl == 0)
+               if (so->so_proto == 0)

                        return (EOPNOTSUPP);
                        return (EOPNOTSUPP);

-               return ((*ifp->if_ioctl)(ifp, cmd, data));
+#ifndef COMPAT_43
+               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);
 }


@@ -285,6 +411,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;


@@ -296,11 +423,47 @@ 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);