X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..c6bf4f310a33a9262d455ea4d3f0630b1255e3fe:/bsd/kern/uipc_proto.c

diff --git a/bsd/kern/uipc_proto.c b/bsd/kern/uipc_proto.c
index a77e126d9..71d3c60d6 100644
--- a/bsd/kern/uipc_proto.c
+++ b/bsd/kern/uipc_proto.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
@@ -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,55 +75,67 @@
 /*
  * Definitions of protocols supported in the UNIX domain.
  */
+struct domain *localdomain = NULL;
+static void pre_unp_init(struct domain *);
 
-int	raw_usrreq(void);
-static void pre_unp_init(void) __attribute__((section("__TEXT, initcode")));
+extern struct domain localdomain_s;
 
 static struct protosw localsw[] = {
 	{
-		.pr_type = SOCK_STREAM,
-		.pr_domain = &localdomain,
-		.pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS,
+		.pr_type =      SOCK_STREAM,
+		.pr_flags =     PR_CONNREQUIRED | PR_WANTRCVD | PR_RIGHTS | PR_PCBLOCK,
 		.pr_ctloutput = uipc_ctloutput,
-		.pr_usrreqs = &uipc_usrreqs,
+		.pr_usrreqs =   &uipc_usrreqs,
+		.pr_lock =      unp_lock,
+		.pr_unlock =    unp_unlock,
+		.pr_getlock =   unp_getlock
 	},
 	{
-		.pr_type = SOCK_DGRAM,
-		.pr_domain = &localdomain,
-		.pr_flags = PR_ATOMIC|PR_ADDR|PR_RIGHTS,
+		.pr_type =      SOCK_DGRAM,
+		.pr_flags =     PR_ATOMIC | PR_ADDR | PR_RIGHTS,
 		.pr_ctloutput = uipc_ctloutput,
-		.pr_usrreqs = &uipc_usrreqs,
+		.pr_usrreqs =   &uipc_usrreqs,
+		.pr_lock =      unp_lock,
+		.pr_unlock =    unp_unlock,
+		.pr_getlock =   unp_getlock
 	},
 	{
-		.pr_ctlinput  = raw_ctlinput,
-		.pr_usrreqs = &raw_usrreqs,
+		.pr_ctlinput =  raw_ctlinput,
+		.pr_usrreqs =   &raw_usrreqs,
 	},
 };
 
-int local_proto_count = (sizeof (localsw) / sizeof (struct protosw));
+static int local_proto_count = (sizeof(localsw) / sizeof(struct protosw));
 
 static void
-pre_unp_init(void)
+pre_unp_init(struct domain *dp)
 {
-	static int localdomain_initted = 0;
-	int i;
 	struct protosw *pr;
-	struct domain *dp = &localdomain;
+	int i;
+
+	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);
+	}
 
-	for (i=0, pr = &localsw[0]; i<local_proto_count; i++, pr++)
-		net_add_proto(pr, dp);
 	unp_init();
 }
 
-struct domain localdomain = {
-	.dom_family = AF_LOCAL,
-	.dom_name = "unix",
-	.dom_init = pre_unp_init,
-	.dom_externalize = unp_externalize,
-	.dom_dispose = unp_dispose,
-	.dom_protosw = localsw
+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");
+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");