BSD 4_4 release

[unix-history] / usr / src / sys / netns / ns_if.h

diff --git a/usr/src/sys/netns/ns_if.h b/usr/src/sys/netns/ns_if.h
index b58c2dd..3abb284 100644 (file)
--- a/usr/src/sys/netns/ns_if.h
+++ b/usr/src/sys/netns/ns_if.h
@@ -1,20 +1,36 @@
 /*
 /*

- * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1984, 1985, 1986, 1987, 1993
+ *     The 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)ns_if.h     7.4 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)ns_if.h     8.1 (Berkeley) 6/10/93

  */
 
 /*
  */
 
 /*


@@ -27,9 +43,7 @@
 struct ns_ifaddr {
        struct  ifaddr ia_ifa;          /* protocol-independent info */
 #define        ia_ifp          ia_ifa.ifa_ifp
 struct ns_ifaddr {
        struct  ifaddr ia_ifa;          /* protocol-independent info */
 #define        ia_ifp          ia_ifa.ifa_ifp

-/*     union   ns_net  ia_net;         /* network number of interface */
-#define ia_net         ia_addr.sns_addr.x_net
-       int     ia_flags;
+#define        ia_flags        ia_ifa.ifa_flags

        struct  ns_ifaddr *ia_next;     /* next in list of xerox addresses */
        struct  sockaddr_ns ia_addr;    /* reserve space for my address */
        struct  sockaddr_ns ia_dstaddr; /* space for my broadcast address */
        struct  ns_ifaddr *ia_next;     /* next in list of xerox addresses */
        struct  sockaddr_ns ia_addr;    /* reserve space for my address */
        struct  sockaddr_ns ia_dstaddr; /* space for my broadcast address */


@@ -49,10 +63,6 @@ struct       ns_aliasreq {
  */
 
 #define        IA_SNS(ia) (&(((struct ns_ifaddr *)(ia))->ia_addr))
  */
 
 #define        IA_SNS(ia) (&(((struct ns_ifaddr *)(ia))->ia_addr))

-/*
- * ia_flags
- */
-#define        IFA_ROUTE       0x01            /* routing entry installed */

 
 /* This is not the right place for this but where is? */
 #define        ETHERTYPE_NS    0x0600
 
 /* This is not the right place for this but where is? */
 #define        ETHERTYPE_NS    0x0600