X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..316670eb35587141e969394ae8537d66b9211e80:/bsd/kern/uipc_proto.c?ds=sidebyside

diff --git a/bsd/kern/uipc_proto.c b/bsd/kern/uipc_proto.c
index c08bcd73a..f04b308bf 100644
--- a/bsd/kern/uipc_proto.c
+++ b/bsd/kern/uipc_proto.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * 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 */
@@ -70,59 +75,59 @@
  * Definitions of protocols supported in the UNIX domain.
  */
 
-int	uipc_usrreq(), raw_usrreq();
-void	raw_init(), raw_input(), raw_ctlinput();
-extern	struct domain localdomain;		/* or at least forward */
+int	raw_usrreq(void);
+static void pre_unp_init(void) __attribute__((section("__TEXT, initcode")));
 
 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
-
-},
-{ 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
-},
-{ 0,		0,		0,		0,
-  0,		0,		raw_ctlinput,	0,
-  0,
-  0,		0,		0,		0,
-  0,
-  &raw_usrreqs,
-  0,			0,		0
-}
+	{
+		.pr_type = SOCK_STREAM,
+		.pr_domain = &localdomain,
+		.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
+	},
+	{
+		.pr_type = SOCK_DGRAM,
+		.pr_domain = &localdomain,
+		.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,
+	},
 };
 
 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(void)
+{
+	int i;
+	struct protosw *pr;
+	struct domain *dp = &localdomain;
 
 	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};
-
-
-
-
-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 = {
+	.dom_family = AF_LOCAL,
+	.dom_name = "unix",
+	.dom_init = pre_unp_init,
+	.dom_externalize = unp_externalize,
+	.dom_dispose = unp_dispose,
+	.dom_protosw = localsw
+};
 
+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");