X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/91447636331957f3d9b5ca5b508f07c526b0074d..bb59bff194111743b33cc36712410b5656329d3c:/bsd/kern/uipc_proto.c?ds=sidebyside

diff --git a/bsd/kern/uipc_proto.c b/bsd/kern/uipc_proto.c
index 6fd419ddd..f8eb5e418 100644
--- a/bsd/kern/uipc_proto.c
+++ b/bsd/kern/uipc_proto.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
@@ -61,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>
@@ -68,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 void pre_unp_init()
-{	static int localdomain_initted = 0;
-	register int i;
-	register struct protosw *pr;
-	register struct domain *dp = &localdomain;
+static int local_proto_count = (sizeof (localsw) / sizeof (struct protosw));
 
-	for (i=0, pr = &localsw[0]; i<local_proto_count; i++, pr++)
-		net_add_proto(pr, dp);
-	unp_init();
-}
+static void
+pre_unp_init(struct domain *dp)
+{
+	struct protosw *pr;
+	int i;
 
-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");