fix bug in routing socket, add sanity check . . .

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

diff --git a/usr/src/sys/net/if.h b/usr/src/sys/net/if.h
index de40be0..13c1ff3 100644 (file)
--- a/usr/src/sys/net/if.h
+++ b/usr/src/sys/net/if.h
@@ -2,19 +2,9 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 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.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)if.h        7.6 (Berkeley) %G%
+ *     @(#)if.h        7.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -89,6 +79,7 @@ struct ifnet {
        u_char  if_type;                /* ethernet, tokenring, etc */
        u_char  if_addrlen;             /* media address length */
        u_char  if_hdrlen;              /* media header length */
        u_char  if_type;                /* ethernet, tokenring, etc */
        u_char  if_addrlen;             /* media address length */
        u_char  if_hdrlen;              /* media header length */

+       u_char  if_index;               /* numeric abbreviation for this if  */

 /* more statistics here to avoid recompiling netstat */
        struct  timeval if_lastchange;  /* last updated */
        int     if_ibytes;              /* total number of octets received */
 /* more statistics here to avoid recompiling netstat */
        struct  timeval if_lastchange;  /* last updated */
        int     if_ibytes;              /* total number of octets received */


@@ -126,16 +117,16 @@ struct ifnet {
 #define        IF_QFULL(ifq)           ((ifq)->ifq_len >= (ifq)->ifq_maxlen)
 #define        IF_DROP(ifq)            ((ifq)->ifq_drops++)
 #define        IF_ENQUEUE(ifq, m) { \
 #define        IF_QFULL(ifq)           ((ifq)->ifq_len >= (ifq)->ifq_maxlen)
 #define        IF_DROP(ifq)            ((ifq)->ifq_drops++)
 #define        IF_ENQUEUE(ifq, m) { \

-       (m)->m_act = 0; \
+       (m)->m_nextpkt = 0; \

        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_head = m; \
        else \
        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_head = m; \
        else \

-               (ifq)->ifq_tail->m_act = m; \
+               (ifq)->ifq_tail->m_nextpkt = m; \

        (ifq)->ifq_tail = m; \
        (ifq)->ifq_len++; \
 }
 #define        IF_PREPEND(ifq, m) { \
        (ifq)->ifq_tail = m; \
        (ifq)->ifq_len++; \
 }
 #define        IF_PREPEND(ifq, m) { \

-       (m)->m_act = (ifq)->ifq_head; \
+       (m)->m_nextpkt = (ifq)->ifq_head; \

        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_tail = (m); \
        (ifq)->ifq_head = (m); \
        if ((ifq)->ifq_tail == 0) \
                (ifq)->ifq_tail = (m); \
        (ifq)->ifq_head = (m); \


@@ -144,9 +135,9 @@ struct ifnet {
 #define        IF_DEQUEUE(ifq, m) { \
        (m) = (ifq)->ifq_head; \
        if (m) { \
 #define        IF_DEQUEUE(ifq, m) { \
        (m) = (ifq)->ifq_head; \
        if (m) { \

-               if (((ifq)->ifq_head = (m)->m_act) == 0) \
+               if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) \

                        (ifq)->ifq_tail = 0; \
                        (ifq)->ifq_tail = 0; \

-               (m)->m_act = 0; \
+               (m)->m_nextpkt = 0; \

                (ifq)->ifq_len--; \
        } \
 }
                (ifq)->ifq_len--; \
        } \
 }


@@ -167,7 +158,12 @@ struct ifaddr {
        struct  sockaddr *ifa_netmask;  /* used to determine subnet */
        struct  ifnet *ifa_ifp;         /* back-pointer to interface */
        struct  ifaddr *ifa_next;       /* next address for interface */
        struct  sockaddr *ifa_netmask;  /* used to determine subnet */
        struct  ifnet *ifa_ifp;         /* back-pointer to interface */
        struct  ifaddr *ifa_next;       /* next address for interface */

+       int     (*ifa_rtrequest)();     /* check or clean routes (+ or -)'d */
+       struct  rtentry *ifa_rt;        /* ??? for ROUTETOIF */
+       u_short ifa_flags;              /* mostly rt_flags for cloning */
+       u_short ifa_llinfolen;          /* extra to malloc for link info */

 };
 };

+#define IFA_ROUTE      RTF_UP          /* route installed */

 /*
  * Interface request structure used for socket
  * ioctl's.  All interface ioctl's must have parameter
 /*
  * Interface request structure used for socket
  * ioctl's.  All interface ioctl's must have parameter