xnu-2782.40.9.tar.gz

[apple/xnu.git] / bsd / kern / uipc_proto.c

diff --git a/bsd/kern/uipc_proto.c b/bsd/kern/uipc_proto.c
index 44d830308836b9e90a93380189bdcd5233d1ac4f..f8eb5e418e8f1d4bebb0ea1e729614ab365655ec 100644 (file)
--- a/bsd/kern/uipc_proto.c
+++ b/bsd/kern/uipc_proto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -67,6 +67,7 @@
 #include <sys/protosw.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>
+#include <sys/mcache.h>
 #include <sys/un.h>
 #include <net/raw_cb.h>
 #include <sys/sysctl.h>
@@ -74,60 +75,66 @@
 /*
  * Definitions of protocols supported in the UNIX domain.
  */
+struct domain *localdomain = NULL;
+static void pre_unp_init(struct domain *);
 
-int    uipc_usrreq(), raw_usrreq();
-void   raw_init(), raw_input(), raw_ctlinput();
-extern struct domain localdomain;              /* or at least forward */
+extern struct domain localdomain_s;
 
 static struct protosw localsw[] = {
-{ SOCK_STREAM, &localdomain,   0,      PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,
-  0,           0,              0,              uipc_ctloutput,
-  0,
-  0,           0,              0,              0,
-  0,   
-  &uipc_usrreqs,
-  0,           0,              0
-
+{
+       .pr_type =      SOCK_STREAM,
+       .pr_flags =     PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS|PR_PCBLOCK,
+       .pr_ctloutput = uipc_ctloutput,
+       .pr_usrreqs =   &uipc_usrreqs,
+       .pr_lock =      unp_lock,
+       .pr_unlock =    unp_unlock,
+       .pr_getlock =   unp_getlock
 },
-{ SOCK_DGRAM,  &localdomain,   0,              PR_ATOMIC|PR_ADDR|PR_RIGHTS,
-  0,           0,              0,              uipc_ctloutput,
-  0,
-  0,           0,              0,              0,
-  0,   
-  &uipc_usrreqs,
-  0,           0,              0
+{
+       .pr_type =      SOCK_DGRAM,
+       .pr_flags =     PR_ATOMIC|PR_ADDR|PR_RIGHTS,
+       .pr_ctloutput = uipc_ctloutput,
+       .pr_usrreqs =   &uipc_usrreqs,
+       .pr_lock =      unp_lock,
+       .pr_unlock =    unp_unlock,
+       .pr_getlock =   unp_getlock
+},
+{
+       .pr_ctlinput =  raw_ctlinput,
+       .pr_usrreqs =   &raw_usrreqs,
 },
-{ 0,           0,              0,              0,
-  0,           0,              raw_ctlinput,   0,
-  0,
-  0,           0,              0,              0,
-  0,
-  &raw_usrreqs,
-  0,                   0,              0
-}
 };
 
-int local_proto_count = (sizeof (localsw) / sizeof (struct protosw));
+static int local_proto_count = (sizeof (localsw) / sizeof (struct protosw));
 
-static void pre_unp_init()
-{      static int localdomain_initted = 0;
-       register int i;
-       register struct protosw *pr;
-       register struct domain *dp = &localdomain;
+static void
+pre_unp_init(struct domain *dp)
+{
+       struct protosw *pr;
+       int i;
 
-       for (i=0, pr = &localsw[0]; i<local_proto_count; i++, pr++)
-               net_add_proto(pr, dp);
-       unp_init();
-}
-
-struct domain localdomain =
-    { AF_LOCAL, "unix", pre_unp_init, unp_externalize, unp_dispose,
-      localsw};
+       VERIFY(!(dp->dom_flags & DOM_INITIALIZED));
+       VERIFY(localdomain == NULL);
 
+       localdomain = dp;
 
+       for (i = 0, pr = &localsw[0]; i < local_proto_count; i++, pr++)
+               net_add_proto(pr, dp, 1);
 
+       unp_init();
+}
 
-SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW, 0, "Local domain");
-SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW, 0, "SOCK_STREAM");
-SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW, 0, "SOCK_DGRAM");
+struct domain localdomain_s = {
+       .dom_family =           PF_LOCAL,
+       .dom_name =             "unix",
+       .dom_init =             pre_unp_init,
+       .dom_externalize =      unp_externalize,
+       .dom_dispose =          unp_dispose,
+};
 
+SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW|CTLFLAG_LOCKED,
+       NULL, "Local domain");
+SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW|CTLFLAG_LOCKED,
+       NULL, "SOCK_STREAM");
+SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW|CTLFLAG_LOCKED,
+       NULL, "SOCK_DGRAM");