BSD 4_4_Lite2 release

[unix-history] / usr / src / sys / netns / ns_proto.c

diff --git a/usr/src/sys/netns/ns_proto.c b/usr/src/sys/netns/ns_proto.c
index 9873da0..5bad689 100644 (file)
--- a/usr/src/sys/netns/ns_proto.c
+++ b/usr/src/sys/netns/ns_proto.c
@@ -1,42 +1,57 @@
 /*
 /*

- * 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 is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  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.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY 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_proto.c  7.4 (Berkeley) 6/28/90
+ * 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_proto.c  8.2 (Berkeley) 2/9/95

  */
 
  */
 

-#include "param.h"
-#include "socket.h"
-#include "protosw.h"
-#include "domain.h"
-#include "mbuf.h"
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/mbuf.h>
+
+#include <net/radix.h>

 
 

-#include "ns.h"
+#include <netns/ns.h>

 
 /*
  * NS protocol family: IDP, ERR, PE, SPP, ROUTE.
  */
 
 /*
  * NS protocol family: IDP, ERR, PE, SPP, ROUTE.
  */

-int    ns_init();
-int    idp_input(), idp_output(), idp_ctlinput(), idp_usrreq();
-int    idp_raw_usrreq(), idp_ctloutput();
-int    spp_input(), spp_ctlinput();
+void   ns_init();
+int    idp_output(), idp_usrreq(), idp_raw_usrreq(), idp_ctloutput();
+void   idp_input(), idp_ctlinput();
+void   spp_input(), spp_ctlinput();

 int    spp_usrreq(), spp_usrreq_sp(), spp_ctloutput();
 int    spp_usrreq(), spp_usrreq_sp(), spp_ctloutput();

-int    spp_init(), spp_fasttimo(), spp_slowtimo();
+void   spp_init(), spp_fasttimo(), spp_slowtimo();

 extern int raw_usrreq();
 
 extern struct domain nsdomain;
 extern int raw_usrreq();
 
 extern struct domain nsdomain;


@@ -76,5 +91,6 @@ struct protosw nssw[] = {
 
 struct domain nsdomain =
     { AF_NS, "network systems", 0, 0, 0, 
 
 struct domain nsdomain =
     { AF_NS, "network systems", 0, 0, 0, 

-      nssw, &nssw[sizeof(nssw)/sizeof(nssw[0])] };
+      nssw, &nssw[sizeof(nssw)/sizeof(nssw[0])], 0,
+      rn_inithead, 16, sizeof(struct sockaddr_ns)};