socket ioctls

SCCS-vsn: sys/net/if.c 4.26
SCCS-vsn: sys/net/if.h 4.17
SCCS-vsn: sys/net/route.c 4.18

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index 076699f..2abb68c 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -1,4 +1,4 @@
-/*     if.c    4.25    83/02/10        */
+/*     if.c    4.26    83/03/15        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -6,6 +6,8 @@
 #include "../h/protosw.h"
 #include "../h/time.h"
 #include "../h/kernel.h"
 #include "../h/protosw.h"
 #include "../h/time.h"
 #include "../h/kernel.h"

+#include "../h/ioctl.h"
+#include "../h/errno.h"

 
 #include "../net/if.h"
 #include "../net/af.h"
 
 #include "../net/if.h"
 #include "../net/af.h"


@@ -170,3 +172,112 @@ if_slowtimo()
        }
        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.
+ */
+ifrequest(cmd, data)
+       int cmd;
+       caddr_t data;
+{
+       register struct ifnet *ifp;
+       register struct ifreq *ifr;
+       register char *cp;
+       int unit, s;
+
+       ifr = (struct ifreq *)data;
+       for (cp = ifr->ifr_name; *cp; cp++)
+               if (*cp >= '0' && *cp <= '9')
+                       break;
+       if (*cp == 0)
+               return (ENXIO);         /* couldn't find unit */
+       unit = *cp - '0', *cp = 0;
+       for (ifp = ifnet; ifp; ifp = ifp->if_next) {
+               if (bcmp(ifp->if_name, ifr->ifr_name, cp - ifr->ifr_name))
+                       continue;
+               if (unit == ifp->if_unit)
+                       goto found;
+       }
+       return (ENXIO);
+
+found:
+       switch (cmd) {
+
+       case SIOCGIFADDR:
+               ifr->ifr_addr = ifp->if_addr;
+               break;
+
+       case SIOCSIFADDR:
+               if_rtinit(ifp, -1);     /* delete previous route */
+               s = splimp();
+               ifp->if_addr = ifr->ifr_addr;
+               (*ifp->if_init)(unit);
+               splx(s);
+               break;
+
+       case SIOCGIFDSTADDR:
+               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
+                       return (EINVAL);
+               ifr->ifr_dstaddr = ifp->if_dstaddr;
+               break;
+
+       case SIOCSIFDSTADDR:
+               if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
+                       return (EINVAL);
+               s = splimp();
+               ifp->if_dstaddr = ifr->ifr_dstaddr;
+               splx(s);
+               break;
+
+       case SIOCGIFFLAGS:
+               ifr->ifr_flags = ifp->if_flags;
+               break;
+
+       case SIOCSIFFLAGS:
+               if ((ifr->ifr_flags & IFF_UP) == 0 &&
+                   (ifp->if_flags & IFF_UP)) {
+                       s = splimp();
+                       if_down(ifp);
+                       splx(s);
+               }
+               ifp->if_flags = ifr->ifr_flags;
+               break;
+
+       default:
+               return (EINVAL);
+       }
+       return (0);
+}
+
+/*
+ * Return interface configuration
+ * of system.  List may be used
+ * in later ioctl's (above) to get
+ * other information.
+ */
+ifconf(cmd, data)
+       int cmd;
+       caddr_t data;
+{
+       register struct ifconf *ifc = (struct ifconf *)data;
+       register struct ifnet *ifp = ifnet;
+       register char *cp;
+       struct ifreq ifr;
+       int space = ifc->ifc_len, error = 0;
+
+       for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
+               bcopy(ifp->if_name, ifr.ifr_name, sizeof (ifr.ifr_name));
+               for (cp = ifr.ifr_name; *cp; cp++)
+                       ;
+               *cp = '0' + ifp->if_unit;
+               ifr.ifr_addr = ifp->if_addr;
+               error = copyout((caddr_t)&ifr, ifc->ifc_buf, sizeof (ifr));
+               if (error)
+                       break;
+               space -= sizeof (ifr);
+               ifc->ifc_req++;
+       }
+       ifc->ifc_len -= space;
+       return (error);
+}

diff --git a/usr/src/sys/net/if.h b/usr/src/sys/net/if.h
index fd639ff..d53f7e6 100644 (file)
--- a/usr/src/sys/net/if.h
+++ b/usr/src/sys/net/if.h
@@ -1,4 +1,4 @@
-/*     if.h    4.16    82/10/31        */
+/*     if.h    4.17    83/03/15        */

 
 /*
  * Structures defining a network interface, providing a packet
 
 /*
  * Structures defining a network interface, providing a packet


@@ -112,6 +112,39 @@ struct ifnet {
 #define        IFQ_MAXLEN      50
 #define        IFNET_SLOWHZ    1               /* granularity is 1 second */
 
 #define        IFQ_MAXLEN      50
 #define        IFNET_SLOWHZ    1               /* granularity is 1 second */
 

+/*
+ * Interface request structure used by socket
+ * ioctl's SIOCSIFxxxx (set interface parameter)
+ * and SIOCGIFxxxx (get parameter).
+ */
+struct ifreq {
+       char    ifr_name[16];           /* name of interface (e.g. "ec0") */
+       union {
+               struct  sockaddr ifru_addr;
+               struct  sockaddr ifru_dstaddr;
+               short   ifru_flags;
+       } ifr_ifru;
+#define        ifr_addr        ifr_ifru.ifru_addr      /* address */
+#define        ifr_dstaddr     ifr_ifru.ifru_dstaddr   /* other end of p-to-p link */
+#define        ifr_flags       ifr_ifru.ifru_flags     /* flags */
+};
+
+/*
+ * Structure used in SIOCGIFCONF request.
+ * Used to retrieve interface configuration
+ * for machine (useful for programs which
+ * must know all networks accessible).
+ */
+struct ifconf {
+       int     ifc_len;                /* size of associated buffer */
+       union {
+               caddr_t ifcu_buf;
+               struct  ifreq *ifcu_req;
+       } ifc_ifcu;
+#define        ifc_buf ifc_ifcu.ifcu_buf       /* buffer address */
+#define        ifc_req ifc_ifcu.ifcu_req       /* array of structures returned */
+};
+

 #ifdef KERNEL
 #ifdef INET
 struct ifqueue ipintrq;                /* ip packet input queue */
 #ifdef KERNEL
 #ifdef INET
 struct ifqueue ipintrq;                /* ip packet input queue */

diff --git a/usr/src/sys/net/route.c b/usr/src/sys/net/route.c
index ed8d41e..768b340 100644 (file)
--- a/usr/src/sys/net/route.c
+++ b/usr/src/sys/net/route.c
@@ -1,4 +1,4 @@
-/*     route.c 4.17    83/03/12        */
+/*     route.c 4.18    83/03/15        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -228,10 +228,17 @@ rtinit(dst, gateway, flags)
        int flags;
 {
        struct rtentry route;
        int flags;
 {
        struct rtentry route;

+       int cmd;

 
 

+       if (flags == -1) {
+               cmd = (int)SIOCDELRT;
+               flags = 0;
+       } else {
+               cmd = (int)SIOCADDRT;
+       }

        bzero((caddr_t)&route, sizeof (route));
        route.rt_dst = *dst;
        route.rt_gateway = *gateway;
        route.rt_flags = flags;
        bzero((caddr_t)&route, sizeof (route));
        route.rt_dst = *dst;
        route.rt_gateway = *gateway;
        route.rt_flags = flags;

-       (void) rtrequest((int)SIOCADDRT, &route);
+       (void) rtrequest(cmd, &route);

 }
 }