date and time created 88/03/25 17:38:10 by marc

[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 345f32d..c04bff6 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,26 +1,40 @@
-/*     if.c    4.29    83/06/12        */
+/*
+ * 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 this notice is preserved and that due credit is given
+ * to the University of California at 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'' without express or implied warranty.
+ *
+ *     @(#)if.c        7.2 (Berkeley) %G%
+ */

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/socket.h"
-#include "../h/protosw.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/ioctl.h"
-#include "../h/errno.h"
+#include "param.h"
+#include "systm.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "protosw.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "ioctl.h"
+#include "errno.h"

 
 

-#include "../net/if.h"
-#include "../net/af.h"
+#include "if.h"
+#include "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()


@@ -28,11 +42,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();
 }
 


@@ -47,7 +58,7 @@ 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
 


@@ -69,79 +80,93 @@ 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 ifaddr *
+ifa_ifwithaddr(addr)

        struct sockaddr *addr;
 {
        register struct ifnet *ifp;
        struct sockaddr *addr;
 {
        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)
 
 #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)
+       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(&ifa->ifa_addr, 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);
+}
+/*
+ * Locate the point to point interface with a given destination address.
+ */
+/*ARGSUSED*/
+struct ifaddr *
+ifa_ifwithdstaddr(addr)
+       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(&ifa->ifa_dstaddr, addr))
+                               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)
+struct ifaddr *
+ifa_ifwithnet(addr)

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

+       register struct ifaddr *ifa;

        register u_int af = addr->sa_family;
        register int (*netmatch)();
 
        if (af >= AF_MAX)
                return (0);
        netmatch = afswitch[af].af_netmatch;
        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)
+       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 ((*netmatch)(addr, &ifp->if_addr))
-                       break;
+               if ((*netmatch)(&ifa->ifa_addr, addr))
+                       return (ifa);

        }
        }

-       return (ifp);
-}
-
-/*
- * As above, but parameter is network number.
- */
-struct ifnet *
-if_ifonnetof(net)
-       register int net;
-{
-       register struct ifnet *ifp;
-
-       for (ifp = ifnet; ifp; ifp = ifp->if_next)
-               if (ifp->if_net == net)
-                       break;
-       return (ifp);
+       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


@@ -151,9 +176,11 @@ 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);

 }
 
 /*
 }
 
 /*


@@ -191,7 +218,7 @@ ifunit(name)
                        break;
        if (*cp == '\0' || cp == name + IFNAMSIZ)
                return ((struct ifnet *)0);
                        break;
        if (*cp == '\0' || cp == name + IFNAMSIZ)
                return ((struct ifnet *)0);

-       unit = *cp - '0', *cp = 0;
+       unit = *cp - '0';

        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if (bcmp(ifp->if_name, name, (unsigned)(cp - name)))
                        continue;
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if (bcmp(ifp->if_name, name, (unsigned)(cp - name)))
                        continue;


@@ -204,7 +231,8 @@ ifunit(name)
 /*
  * Interface ioctls.
  */
 /*
  * Interface ioctls.
  */

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

        int cmd;
        caddr_t data;
 {
        int cmd;
        caddr_t data;
 {


@@ -216,12 +244,15 @@ ifioctl(cmd, data)
        case SIOCGIFCONF:
                return (ifconf(cmd, data));
 
        case SIOCGIFCONF:
                return (ifconf(cmd, data));
 

-       case SIOCSIFADDR:
-       case SIOCSIFFLAGS:
-       case SIOCSIFDSTADDR:
+#if defined(INET) && NETHER > 0
+       case SIOCSARP:
+       case SIOCDARP:

                if (!suser())
                        return (u.u_error);
                if (!suser())
                        return (u.u_error);

-               break;
+               /* FALL THROUGH */
+       case SIOCGARP:
+               return (arpioctl(cmd, data));
+#endif

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


@@ -229,24 +260,39 @@ ifioctl(cmd, data)
                return (ENXIO);
        switch (cmd) {
 
                return (ENXIO);
        switch (cmd) {
 

-       case SIOCGIFADDR:
-               ifr->ifr_addr = ifp->if_addr;
+       case SIOCGIFFLAGS:
+               ifr->ifr_flags = ifp->if_flags;

                break;
 
                break;
 

-       case SIOCGIFDSTADDR:
-               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
-                       return (EINVAL);
-               ifr->ifr_dstaddr = ifp->if_dstaddr;
+       case SIOCGIFMETRIC:
+               ifr->ifr_metric = ifp->if_metric;

                break;
 
                break;
 

-       case SIOCGIFFLAGS:
-               ifr->ifr_flags = ifp->if_flags;
+       case SIOCSIFFLAGS:
+               if (!suser())
+                       return (u.u_error);
+               if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
+                       int s = splimp();
+                       if_down(ifp);
+                       splx(s);
+               }
+               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 (!suser())
+                       return (u.u_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)(cmd, data));
+               return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
+                       cmd, data, ifp));

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


@@ -264,6 +310,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,11 +322,20 @@ 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) {
+                       ifr.ifr_addr = ifa->ifa_addr;
+                       error = copyout((caddr_t)&ifr, (caddr_t)ifrp, sizeof (ifr));
+                       if (error)
+                               break;
+                       space -= sizeof (ifr), ifrp++;
+               }

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