xnu-2050.7.9.tar.gz

[apple/xnu.git] / bsd / netinet / in.h

diff --git a/bsd/netinet/in.h b/bsd/netinet/in.h
index 4e66c26c778c93627c7a40e8dfd3b63b1362b636..4e0d49b9e18970ee2a68a706555a4435e3578f1b 100644 (file)
--- a/bsd/netinet/in.h
+++ b/bsd/netinet/in.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -430,7 +430,7 @@ struct ip_opts {
 #define        IP_RECVIF               20   /* bool; receive reception if w/dgram */
 /* for IPSEC */
 #define        IP_IPSEC_POLICY         21   /* int; set/get security policy */
-#define        IP_FAITH                22   /* bool; accept FAITH'ed connections */
+#define        IP_FAITH                22   /* deprecated */
 #ifdef __APPLE__
 #define IP_STRIPHDR            23   /* bool: drop receive of raw IP header */
 #endif
@@ -601,13 +601,13 @@ struct sockaddr;
  * We use uint32_t here to be consistent.
  */
 int    setipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t,
-           uint32_t, struct in_addr *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
+           uint32_t, struct in_addr *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 int    getipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t *,
-           uint32_t *, struct in_addr *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
+           uint32_t *, struct in_addr *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 int    setsourcefilter(int, uint32_t, struct sockaddr *, socklen_t,
-           uint32_t, uint32_t, struct sockaddr_storage *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
+           uint32_t, uint32_t, struct sockaddr_storage *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 int    getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t,
-           uint32_t *, uint32_t *, struct sockaddr_storage *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_NA);
+           uint32_t *, uint32_t *, struct sockaddr_storage *) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 #endif
 
 /*
@@ -737,7 +737,7 @@ struct in_pktinfo {
 #define        IPCTL_STATS             12      /* ipstat structure */
 #define        IPCTL_ACCEPTSOURCEROUTE 13      /* may accept source routed packets */
 #define        IPCTL_FASTFORWARDING    14      /* use fast IP forwarding code */
-#define        IPCTL_KEEPFAITH         15      /* FAITH IPv4->IPv6 translater ctl */
+#define        IPCTL_KEEPFAITH         15      /* deprecated */
 #define        IPCTL_GIF_TTL           16      /* default TTL for gif encap packet */
 #define        IPCTL_MAXID             17
 
@@ -796,6 +796,9 @@ extern int inaddr_local(struct in_addr);
 #define        in_nullhost(x)  ((x).s_addr == INADDR_ANY)
 #define        in_allhosts(x)  ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP))
 
+#define        SIN(s)          ((struct sockaddr_in *)(void *)s)
+#define        satosin(sa)     SIN(sa)
+#define        sintosa(sin)    ((struct sockaddr *)(void *)(sin))
 #endif /* KERNEL_PRIVATE */
 #define MAX_IPv4_STR_LEN       16
 #define MAX_IPv6_STR_LEN       64