BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / kern / uipc_proto.c

diff --git a/usr/src/sys/kern/uipc_proto.c b/usr/src/sys/kern/uipc_proto.c
index 6c789cb..fd1dbae 100644 (file)
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -1,10 +1,43 @@
-/*     uipc_proto.c    6.1     83/07/29        */
+/*-
+ * Copyright (c) 1982, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ *     @(#)uipc_proto.c        7.6 (Berkeley) 5/9/91
+ */

 
 

-#include "../h/param.h"
-#include "../h/socket.h"
-#include "../h/protosw.h"
-#include "../h/domain.h"
-#include "../h/mbuf.h"
+#include "param.h"
+#include "socket.h"
+#include "protosw.h"
+#include "domain.h"
+#include "mbuf.h"

 
 /*
  * Definitions of protocols supported in the UNIX domain.
 
 /*
  * Definitions of protocols supported in the UNIX domain.


@@ -12,14 +45,15 @@
 
 int    uipc_usrreq();
 int    raw_init(),raw_usrreq(),raw_input(),raw_ctlinput();
 
 int    uipc_usrreq();
 int    raw_init(),raw_usrreq(),raw_input(),raw_ctlinput();

+extern struct domain unixdomain;               /* or at least forward */

 
 struct protosw unixsw[] = {
 
 struct protosw unixsw[] = {

-{ SOCK_STREAM, PF_UNIX,        0,              PR_CONNREQUIRED|PR_WANTRCVD,
+{ SOCK_STREAM, &unixdomain,    0,      PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,

   0,           0,              0,              0,
   uipc_usrreq,
   0,           0,              0,              0,
 },
   0,           0,              0,              0,
   uipc_usrreq,
   0,           0,              0,              0,
 },

-{ SOCK_DGRAM,  PF_UNIX,        0,              PR_ATOMIC|PR_ADDR|PR_RIGHTS,
+{ SOCK_DGRAM,  &unixdomain,    0,              PR_ATOMIC|PR_ADDR|PR_RIGHTS,

   0,           0,              0,              0,
   uipc_usrreq,
   0,           0,              0,              0,
   0,           0,              0,              0,
   uipc_usrreq,
   0,           0,              0,              0,


@@ -31,5 +65,8 @@ struct protosw unixsw[] = {
 }
 };
 
 }
 };
 

+int    unp_externalize(), unp_dispose();
+

 struct domain unixdomain =
 struct domain unixdomain =

-    { AF_UNIX, "unix", unixsw, &unixsw[sizeof(unixsw)/sizeof(unixsw[0])] };
+    { AF_UNIX, "unix", 0, unp_externalize, unp_dispose,
+      unixsw, &unixsw[sizeof(unixsw)/sizeof(unixsw[0])] };