BSD 4_4_Lite2 release

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

diff --git a/usr/src/sys/net/route.h b/usr/src/sys/net/route.h
index 2518d8e..95a8eff 100644 (file)
--- a/usr/src/sys/net/route.h
+++ b/usr/src/sys/net/route.h
@@ -2,9 +2,35 @@
  * Copyright (c) 1980, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1980, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)route.h     8.5 (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.
+ *
+ *     @(#)route.h     8.5 (Berkeley) 2/8/95

  */
 
 /*
  */
 
 /*


@@ -151,8 +177,6 @@ struct rt_msghdr {
 #define RTM_NEWADDR    0xc     /* address being added to iface */
 #define RTM_DELADDR    0xd     /* address being removed from iface */
 #define RTM_IFINFO     0xe     /* iface going up/down etc. */
 #define RTM_NEWADDR    0xc     /* address being added to iface */
 #define RTM_DELADDR    0xd     /* address being removed from iface */
 #define RTM_IFINFO     0xe     /* iface going up/down etc. */

-#define RTM_ADDPKT     0xf     /* Add Route based on entire packet hdr */
-#define RTM_DELPKT     0x10    /* Delete Route base on entire packet hdr */

 
 #define RTV_MTU                0x1     /* init or lock _mtu */
 #define RTV_HOPCOUNT   0x2     /* init or lock _hopcount */
 
 #define RTV_MTU                0x1     /* init or lock _mtu */
 #define RTV_HOPCOUNT   0x2     /* init or lock _hopcount */


@@ -191,10 +215,6 @@ struct rt_msghdr {
 struct rt_addrinfo {
        int     rti_addrs;
        struct  sockaddr *rti_info[RTAX_MAX];
 struct rt_addrinfo {
        int     rti_addrs;
        struct  sockaddr *rti_info[RTAX_MAX];

-       int     rti_flags;
-       struct  ifaddr *rti_ifa;
-       struct  ifnet *rti_ifp;
-       struct  rt_msghdr *rti_rtm;

 };
 
 struct route_cb {
 };
 
 struct route_cb {