add SO_TYPE option (get only!), correct mbuf lengths

[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..bd97f53 100644 (file)
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -1,10 +1,16 @@
-/*     uipc_proto.c    6.1     83/07/29        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)uipc_proto.c        6.4 (Berkeley) %G%
+ */

 
 

-#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 +18,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,

   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 +38,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])] };