xnu-3789.41.3.tar.gz

[apple/xnu.git] / bsd / net / raw_cb.h

diff --git a/bsd/net/raw_cb.h b/bsd/net/raw_cb.h
index 1681cf8c9e1fb4dcd9fe9d8a2fd6356f851e36c8..c944ec005effb6d0c580791084f0babd11d409c6 100644 (file)
--- a/bsd/net/raw_cb.h
+++ b/bsd/net/raw_cb.h
@@ -1,14 +1,19 @@
 /*
- * 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@
  * 
  * 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) 1980, 1986, 1993
@@ -57,11 +62,9 @@
 
 #ifndef _NET_RAW_CB_H_
 #define _NET_RAW_CB_H_
-#include <sys/appleapiopts.h>
-
+#ifdef BSD_KERNEL_PRIVATE
 #include <sys/queue.h>
 
-#ifdef PRIVATE
 /*
  * Raw protocol interface control block.  Used
  * to tie a socket to the generic raw interface.
@@ -72,7 +75,7 @@ struct rawcb {
        struct  sockaddr *rcb_faddr;    /* destination address */
        struct  sockaddr *rcb_laddr;    /* socket's address */
        struct  sockproto rcb_proto;    /* protocol family, protocol */
-       u_long  reserved[4];            /* for future use */
+       uint32_t        reserved[4];            /* for future use */
 };
 
 #define        sotorawcb(so)           ((struct rawcb *)(so)->so_pcb)
@@ -82,20 +85,19 @@ struct rawcb {
  */
 #define        RAWSNDQ         8192
 #define        RAWRCVQ         8192
-#endif /* PRIVATE */
 
-#ifdef KERNEL_PRIVATE
 extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list;
 
-int     raw_attach(struct socket *, int);
-void    raw_ctlinput(int, struct sockaddr *, void *);
-void    raw_detach(struct rawcb *);
-void    raw_disconnect(struct rawcb *);
-void    raw_init(void);
-void    raw_input(struct mbuf *,
-           struct sockproto *, struct sockaddr *, struct sockaddr *);
+__BEGIN_DECLS
+extern int raw_attach(struct socket *, int);
+extern void raw_ctlinput(int, struct sockaddr *, void *);
+extern void raw_detach(struct rawcb *);
+extern void raw_disconnect(struct rawcb *);
+extern void raw_init(struct protosw *, struct domain *);
+extern void raw_input(struct mbuf *, struct sockproto *, struct sockaddr *,
+    struct sockaddr *);
+__END_DECLS
 
 extern struct pr_usrreqs raw_usrreqs;
-#endif KERNEL_PRIVATE
-
-#endif
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NET_RAW_CB_H_ */