xnu-4570.51.1.tar.gz

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

diff --git a/bsd/netinet/in_var.h b/bsd/netinet/in_var.h
index 5b047a56164f662d382a8f513bdc02cd303381d7..5b0506120dd82e5693d7c410c32fc42c99681ad1 100644 (file)
--- a/bsd/netinet/in_var.h
+++ b/bsd/netinet/in_var.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -66,6 +66,7 @@
 
 #include <sys/queue.h>
 #include <sys/kern_event.h>
+#include <net/net_kev.h>
 
 #ifdef BSD_KERNEL_PRIVATE
 #include <net/route.h>
@@ -143,28 +144,10 @@ struct kev_in_portinuse {
 };
 #endif /* __APPLE_API_PRIVATE */
 
-/*
- * Define inet event subclass and specific inet events.
- */
-#define        KEV_INET_SUBCLASS               1 /* inet subclass identifier */
-
-#define        KEV_INET_NEW_ADDR               1 /* Userland configured IP address */
-#define        KEV_INET_CHANGED_ADDR           2 /* Address changed event */
-#define        KEV_INET_ADDR_DELETED           3 /* IPv6 address was deleted */
-#define        KEV_INET_SIFDSTADDR             4 /* Dest. address was set */
-#define        KEV_INET_SIFBRDADDR             5 /* Broadcast address was set */
-#define        KEV_INET_SIFNETMASK             6 /* Netmask was set */
-#define        KEV_INET_ARPCOLLISION           7 /* ARP collision detected */
-#ifdef __APPLE_API_PRIVATE
-#define        KEV_INET_PORTINUSE              8 /* use ken_in_portinuse */
-#endif
-#define        KEV_INET_ARPRTRFAILURE          9 /* ARP resolution failed for router */
-#define        KEV_INET_ARPRTRALIVE            10 /* ARP resolution succeeded for 
-                                             router */
-
 #ifdef BSD_KERNEL_PRIVATE
 #include <net/if.h>
 #include <net/if_var.h>
+#include <net/if_llatbl.h>
 #include <kern/locks.h>
 #include <sys/tree.h>
 /*
@@ -353,10 +336,10 @@ struct in_multi {
 };
 
 #define        INM_LOCK_ASSERT_HELD(_inm)                                      \
-       lck_mtx_assert(&(_inm)->inm_lock, LCK_MTX_ASSERT_OWNED)
+       LCK_MTX_ASSERT(&(_inm)->inm_lock, LCK_MTX_ASSERT_OWNED)
 
 #define        INM_LOCK_ASSERT_NOTHELD(_inm)                                   \
-       lck_mtx_assert(&(_inm)->inm_lock, LCK_MTX_ASSERT_NOTOWNED)
+       LCK_MTX_ASSERT(&(_inm)->inm_lock, LCK_MTX_ASSERT_NOTOWNED)
 
 #define        INM_LOCK(_inm)                                                  \
        lck_mtx_lock(&(_inm)->inm_lock)
@@ -480,14 +463,17 @@ struct inpcb;
 struct in_ifextra {
        uint32_t                netsig_len;
        u_int8_t                netsig[IFNET_SIGNATURELEN];
+       struct lltable          *ii_llt;        /* ARP state */
 };
 #define        IN_IFEXTRA(_ifp)        ((struct in_ifextra *)(_ifp->if_inetdata))
+#define LLTABLE(ifp)           ((IN_IFEXTRA(ifp) == NULL) ? NULL : IN_IFEXTRA(ifp)->ii_llt)
 
 extern u_int32_t ipv4_ll_arp_aware;
 
 extern void in_ifaddr_init(void);
-extern int imo_multi_filter(const struct ip_moptions *, const struct ifnet *,
-    const struct sockaddr *, const struct sockaddr *);
+extern int imo_multi_filter(const struct ip_moptions *,
+    const struct ifnet *, const struct sockaddr_in *,
+    const struct sockaddr_in *);
 extern int imo_clone(struct inpcb *, struct inpcb *);
 extern void inm_commit(struct in_multi *);
 extern void inm_clear_recorded(struct in_multi *);
@@ -515,9 +501,6 @@ extern int in_ifadown(struct ifaddr *ifa, int);
 extern void in_ifscrub(struct ifnet *, struct in_ifaddr *, int);
 extern u_int32_t inaddr_hashval(u_int32_t);
 extern void in_purgeaddrs(struct ifnet *);
-extern int in_selectaddrs(int af, struct sockaddr_list **,
-    struct sockaddr_entry **, struct sockaddr_list **,
-    struct sockaddr_entry **);
 extern void gre_input(struct mbuf *, int);
 extern void imf_leave(struct in_mfilter *);
 extern void imf_purge(struct in_mfilter *);