xnu-7195.101.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..454a58288430771c804b4280de749999f13a63b4 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-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *


@@ -61,11 +61,12 @@
  */
 
 #ifndef _NETINET_IN_VAR_H_
  */
 
 #ifndef _NETINET_IN_VAR_H_

-#define        _NETINET_IN_VAR_H_
+#define _NETINET_IN_VAR_H_

 #include <sys/appleapiopts.h>
 
 #include <sys/queue.h>
 #include <sys/kern_event.h>
 #include <sys/appleapiopts.h>
 
 #include <sys/queue.h>
 #include <sys/kern_event.h>

+#include <net/net_kev.h>

 
 #ifdef BSD_KERNEL_PRIVATE
 #include <net/route.h>
 
 #ifdef BSD_KERNEL_PRIVATE
 #include <net/route.h>


@@ -77,31 +78,31 @@
  * of the structure and is assumed to be first.
  */
 struct in_ifaddr {
  * of the structure and is assumed to be first.
  */
 struct in_ifaddr {

-       struct ifaddr ia_ifa;           /* protocol-independent info */
-#define        ia_ifp          ia_ifa.ifa_ifp
-#define        ia_flags        ia_ifa.ifa_flags
-                                       /* ia_{,sub}net{,mask} in host order */
-       u_int32_t ia_net;               /* network number of interface */
-       u_int32_t ia_netmask;           /* mask of net part */
-       u_int32_t ia_subnet;            /* subnet number, including net */
-       u_int32_t ia_subnetmask;        /* mask of subnet part */
-       struct in_addr ia_netbroadcast; /* to recognize net broadcasts */
-       TAILQ_ENTRY(in_ifaddr) ia_link; /* tailq macro glue */
-       struct sockaddr_in ia_addr;     /* reserve space for interface name */
-       struct sockaddr_in ia_dstaddr;  /* reserve space for broadcast addr */
-#define        ia_broadaddr    ia_dstaddr
-       struct sockaddr_in ia_sockmask; /* reserve space for general netmask */
-       TAILQ_ENTRY(in_ifaddr) ia_hash; /* hash bucket entry */
+       struct ifaddr ia_ifa;           /* protocol-independent info */
+#define ia_ifp          ia_ifa.ifa_ifp
+#define ia_flags        ia_ifa.ifa_flags
+       /* ia_{,sub}net{,mask} in host order */
+       u_int32_t ia_net;               /* network number of interface */
+       u_int32_t ia_netmask;           /* mask of net part */
+       u_int32_t ia_subnet;            /* subnet number, including net */
+       u_int32_t ia_subnetmask;        /* mask of subnet part */
+       struct in_addr ia_netbroadcast; /* to recognize net broadcasts */
+       TAILQ_ENTRY(in_ifaddr) ia_link; /* tailq macro glue */
+       struct sockaddr_in ia_addr;     /* reserve space for interface name */
+       struct sockaddr_in ia_dstaddr;  /* reserve space for broadcast addr */
+#define ia_broadaddr    ia_dstaddr
+       struct sockaddr_in ia_sockmask; /* reserve space for general netmask */
+       TAILQ_ENTRY(in_ifaddr) ia_hash; /* hash bucket entry */

 };
 
 };
 

-#define        ifatoia(ifa)    ((struct in_ifaddr *)(void *)(ifa))
+#define ifatoia(ifa)    ((struct in_ifaddr *)(void *)(ifa))

 #endif /* BSD_KERNEL_PRIVATE */
 
 struct in_aliasreq {
 #endif /* BSD_KERNEL_PRIVATE */
 
 struct in_aliasreq {

-       char ifra_name[IFNAMSIZ];       /* if name, e.g. "en0" */
+       char ifra_name[IFNAMSIZ];       /* if name, e.g. "en0" */

        struct sockaddr_in ifra_addr;
        struct sockaddr_in ifra_broadaddr;
        struct sockaddr_in ifra_addr;
        struct sockaddr_in ifra_broadaddr;

-#define        ifra_dstaddr    ifra_broadaddr
+#define ifra_dstaddr    ifra_broadaddr

        struct sockaddr_in ifra_mask;
 };
 
        struct sockaddr_in ifra_mask;
 };
 


@@ -110,20 +111,20 @@ struct in_aliasreq {
  */
 struct kev_in_data {
        struct net_event_data link_data;
  */
 struct kev_in_data {
        struct net_event_data link_data;

-       struct in_addr ia_addr;         /* interface address */
-       u_int32_t ia_net;               /* network number of interface */
-       u_int32_t ia_netmask;           /* mask of net part */
-       u_int32_t ia_subnet;            /* subnet number, including net */
-       u_int32_t ia_subnetmask;        /* mask of subnet part */
-       struct in_addr ia_netbroadcast; /* to recognize net broadcasts */
+       struct in_addr ia_addr;         /* interface address */
+       u_int32_t ia_net;               /* network number of interface */
+       u_int32_t ia_netmask;           /* mask of net part */
+       u_int32_t ia_subnet;            /* subnet number, including net */
+       u_int32_t ia_subnetmask;        /* mask of subnet part */
+       struct in_addr ia_netbroadcast; /* to recognize net broadcasts */

        struct in_addr ia_dstaddr;
 };
 
 struct kev_in_collision {
        struct net_event_data link_data; /* link where ARP was received on */
        struct in_addr ia_dstaddr;
 };
 
 struct kev_in_collision {
        struct net_event_data link_data; /* link where ARP was received on */

-       struct in_addr ia_ipaddr;       /* conflicting IP address */
-       u_char hw_len;                  /* length of hardware address */
-       u_char hw_addr[0];              /* variable length hardware address */
+       struct in_addr ia_ipaddr;       /* conflicting IP address */
+       u_char hw_len;                  /* length of hardware address */
+       u_char hw_addr[0];              /* variable length hardware address */

 };
 
 struct kev_in_arpfailure {
 };
 
 struct kev_in_arpfailure {


@@ -134,81 +135,81 @@ struct kev_in_arpalive {
        struct net_event_data link_data; /* link where ARP was received */
 };
 
        struct net_event_data link_data; /* link where ARP was received */
 };
 

+#ifdef PRIVATE
+/*
+ * Common structure for KEV_SOCKET_SUBCLASS
+ * Have to place here to avoid declaration dependencies.
+ */
+struct kev_socket_event_data {
+       union sockaddr_in_4_6 kev_sockname;
+       union sockaddr_in_4_6 kev_peername;
+};
+
+struct kev_socket_closed {
+       struct kev_socket_event_data ev_data;
+};
+#endif /* PRIVATE */

 
 #ifdef __APPLE_API_PRIVATE
 struct kev_in_portinuse {
 
 #ifdef __APPLE_API_PRIVATE
 struct kev_in_portinuse {

-       u_int16_t port;         /* conflicting port number in host order */
-       u_int32_t req_pid;      /* PID port requestor */
+       u_int16_t port;         /* conflicting port number in host order */
+       u_int32_t req_pid;      /* PID port requestor */

        u_int32_t reserved[2];
 };
 #endif /* __APPLE_API_PRIVATE */
 
        u_int32_t reserved[2];
 };
 #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
 #ifdef BSD_KERNEL_PRIVATE

+extern void socket_post_kev_msg(uint32_t, struct kev_socket_event_data *,
+    uint32_t);
+extern void socket_post_kev_msg_closed(struct socket *);
+

 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if.h>
 #include <net/if_var.h>

+#include <net/if_llatbl.h>

 #include <kern/locks.h>
 #include <sys/tree.h>
 /*
  * Given a pointer to an in_ifaddr (ifaddr),
  * return a pointer to the addr as a sockaddr_in.
  */
 #include <kern/locks.h>
 #include <sys/tree.h>
 /*
  * Given a pointer to an in_ifaddr (ifaddr),
  * return a pointer to the addr as a sockaddr_in.
  */

-#define        IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define        IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
+#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
+#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))

 
 

-#define        IN_LNAOF(in, ifa) \
+#define IN_LNAOF(in, ifa) \

        ((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
 
 /*
  * Hash table for IPv4 addresses.
  */
 extern TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;
        ((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
 
 /*
  * Hash table for IPv4 addresses.
  */
 extern TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;

-extern TAILQ_HEAD(in_ifaddrhashhead, in_ifaddr) *in_ifaddrhashtbl;
+extern TAILQ_HEAD(in_ifaddrhashhead, in_ifaddr) * in_ifaddrhashtbl;

 extern lck_rw_t *in_ifaddr_rwlock;
 
 extern lck_rw_t *in_ifaddr_rwlock;
 

-#define        INADDR_HASH(x)  (&in_ifaddrhashtbl[inaddr_hashval(x)])
+#define INADDR_HASH(x)  (&in_ifaddrhashtbl[inaddr_hashval(x)])

 
 

-extern u_char  inetctlerrmap[];
+extern  u_char  inetctlerrmap[];

 
 /*
  * Macro for finding the interface (ifnet structure) corresponding to one
  * of our IP addresses.
  */
 
 /*
  * Macro for finding the interface (ifnet structure) corresponding to one
  * of our IP addresses.
  */

-#define        INADDR_TO_IFP(addr, ifp)                                        \
-       /* struct in_addr addr; */                                      \
-       /* struct ifnet *ifp; */                                        \
-{                                                                      \
-       struct in_ifaddr *ia;                                           \
-                                                                       \
-       lck_rw_lock_shared(in_ifaddr_rwlock);                           \
-       TAILQ_FOREACH(ia, INADDR_HASH((addr).s_addr), ia_hash) {        \
-               IFA_LOCK_SPIN(&ia->ia_ifa);                             \
-               if (IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) {     \
-                       IFA_UNLOCK(&ia->ia_ifa);                        \
-                       break;                                          \
-               }                                                       \
-               IFA_UNLOCK(&ia->ia_ifa);                                \
-       }                                                               \
-       (ifp) = (ia == NULL) ? NULL : ia->ia_ifp;                       \
-       lck_rw_done(in_ifaddr_rwlock);                                  \
+#define INADDR_TO_IFP(addr, ifp)                                        \
+       /* struct in_addr addr; */                                      \
+       /* struct ifnet *ifp; */                                        \
+{                                                                       \
+       struct in_ifaddr *ia;                                           \
+                                                                        \
+       lck_rw_lock_shared(in_ifaddr_rwlock);                           \
+       TAILQ_FOREACH(ia, INADDR_HASH((addr).s_addr), ia_hash) {        \
+               IFA_LOCK_SPIN(&ia->ia_ifa);                             \
+               if (IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) {     \
+                       IFA_UNLOCK(&ia->ia_ifa);                        \
+                       break;                                          \
+               }                                                       \
+               IFA_UNLOCK(&ia->ia_ifa);                                \
+       }                                                               \
+       (ifp) = (ia == NULL) ? NULL : ia->ia_ifp;                       \
+       lck_rw_done(in_ifaddr_rwlock);                                  \

 }
 
 /*
 }
 
 /*


@@ -216,18 +217,18 @@ extern    u_char  inetctlerrmap[];
  * to a given interface (ifnet structure).  Caller is responsible for freeing
  * the reference.
  */
  * to a given interface (ifnet structure).  Caller is responsible for freeing
  * the reference.
  */

-#define        IFP_TO_IA(ifp, ia)                                              \
-       /* struct ifnet *ifp; */                                        \
-       /* struct in_ifaddr *ia; */                                     \
-{                                                                      \
-       lck_rw_lock_shared(in_ifaddr_rwlock);                           \
-       for ((ia) = TAILQ_FIRST(&in_ifaddrhead);                        \
-           (ia) != NULL && (ia)->ia_ifp != (ifp);                      \
-           (ia) = TAILQ_NEXT((ia), ia_link))                           \
-               continue;                                               \
-       if ((ia) != NULL)                                               \
-               IFA_ADDREF(&(ia)->ia_ifa);                              \
-       lck_rw_done(in_ifaddr_rwlock);                                  \
+#define IFP_TO_IA(ifp, ia)                                              \
+       /* struct ifnet *ifp; */                                        \
+       /* struct in_ifaddr *ia; */                                     \
+{                                                                       \
+       lck_rw_lock_shared(in_ifaddr_rwlock);                           \
+       for ((ia) = TAILQ_FIRST(&in_ifaddrhead);                        \
+           (ia) != NULL && (ia)->ia_ifp != (ifp);                      \
+           (ia) = TAILQ_NEXT((ia), ia_link))                           \
+               continue;                                               \
+       if ((ia) != NULL)                                               \
+               IFA_ADDREF(&(ia)->ia_ifa);                              \
+       lck_rw_done(in_ifaddr_rwlock);                                  \

 }
 
 /*
 }
 
 /*


@@ -249,25 +250,25 @@ struct router_info {
  * IPv4 multicast IGMP-layer source entry.
  */
 struct ip_msource {
  * IPv4 multicast IGMP-layer source entry.
  */
 struct ip_msource {

-       RB_ENTRY(ip_msource)    ims_link;       /* RB tree links */
-       in_addr_t               ims_haddr;      /* host byte order */
+       RB_ENTRY(ip_msource)    ims_link;       /* RB tree links */
+       in_addr_t               ims_haddr;      /* host byte order */

        struct ims_st {
        struct ims_st {

-               uint16_t        ex;             /* # of exclusive members */
-               uint16_t        in;             /* # of inclusive members */
-       }                       ims_st[2];      /* state at t0, t1 */
-       uint8_t                 ims_stp;        /* pending query */
+               uint16_t        ex;             /* # of exclusive members */
+               uint16_t        in;             /* # of inclusive members */
+       }                       ims_st[2];      /* state at t0, t1 */
+       uint8_t                 ims_stp;        /* pending query */

 };
 
 /*
  * IPv4 multicast PCB-layer source entry.
  */
 struct in_msource {
 };
 
 /*
  * IPv4 multicast PCB-layer source entry.
  */
 struct in_msource {

-       RB_ENTRY(ip_msource)    ims_link;       /* RB tree links */
-       in_addr_t               ims_haddr;      /* host byte order */
-       uint8_t                 imsl_st[2];     /* state before/at commit */
+       RB_ENTRY(ip_msource)    ims_link;       /* RB tree links */
+       in_addr_t               ims_haddr;      /* host byte order */
+       uint8_t                 imsl_st[2];     /* state before/at commit */

 };
 
 };
 

-RB_HEAD(ip_msource_tree, ip_msource);  /* define struct ip_msource_tree */
+RB_HEAD(ip_msource_tree, ip_msource);   /* define struct ip_msource_tree */

 
 RB_PROTOTYPE_SC_PREV(__private_extern__, ip_msource_tree, ip_msource,
     ims_link, ip_msource_cmp);
 
 RB_PROTOTYPE_SC_PREV(__private_extern__, ip_msource_tree, ip_msource,
     ims_link, ip_msource_cmp);


@@ -276,9 +277,9 @@ RB_PROTOTYPE_SC_PREV(__private_extern__, ip_msource_tree, ip_msource,
  * IPv4 multicast PCB-layer group filter descriptor.
  */
 struct in_mfilter {
  * IPv4 multicast PCB-layer group filter descriptor.
  */
 struct in_mfilter {

-       struct ip_msource_tree  imf_sources; /* source list for (S,G) */
-       u_long                  imf_nsrc;    /* # of source entries */
-       uint8_t                 imf_st[2];   /* state before/at commit */
+       struct ip_msource_tree  imf_sources; /* source list for (S,G) */
+       u_long                  imf_nsrc;    /* # of source entries */
+       uint8_t                 imf_st[2];   /* state before/at commit */

 };
 
 struct igmp_ifinfo;
 };
 
 struct igmp_ifinfo;


@@ -308,30 +309,30 @@ struct igmp_ifinfo;
  */
 struct in_multi {
        decl_lck_mtx_data(, inm_lock);
  */
 struct in_multi {
        decl_lck_mtx_data(, inm_lock);

-       u_int32_t inm_refcount;         /* reference count */
-       u_int32_t inm_reqcnt;           /* request count for this address */
-       u_int32_t inm_debug;            /* see ifa_debug flags */
-       LIST_ENTRY(in_multi) inm_link;  /* queue macro glue */
-       struct  in_addr inm_addr;       /* IP multicast address, convenience */
-       struct  ifnet *inm_ifp;         /* back pointer to ifnet */
-       struct  ifmultiaddr *inm_ifma;  /* back pointer to ifmultiaddr */
-       u_int   inm_timer;              /* IGMPv1/v2 group / v3 query timer  */
-       u_int   inm_state;              /*  state of the membership */
-       void *inm_rti;                  /* unused, legacy field */
+       u_int32_t inm_refcount;         /* reference count */
+       u_int32_t inm_reqcnt;           /* request count for this address */
+       u_int32_t inm_debug;            /* see ifa_debug flags */
+       LIST_ENTRY(in_multi) inm_link;  /* queue macro glue */
+       struct  in_addr inm_addr;       /* IP multicast address, convenience */
+       struct  ifnet *inm_ifp;         /* back pointer to ifnet */
+       struct  ifmultiaddr *inm_ifma;  /* back pointer to ifmultiaddr */
+       u_int   inm_timer;              /* IGMPv1/v2 group / v3 query timer  */
+       u_int   inm_state;              /*  state of the membership */
+       void *inm_rti;                  /* unused, legacy field */

 
        /* New fields for IGMPv3 follow. */
 
        /* New fields for IGMPv3 follow. */

-       struct igmp_ifinfo      *inm_igi;       /* IGMP info */
-       SLIST_ENTRY(in_multi)    inm_dtle;      /* detached waiting for rele */
-       SLIST_ENTRY(in_multi)    inm_nrele;     /* to-be-released by IGMP */
-       u_int32_t                inm_nrelecnt;  /* deferred release count */
-       struct ip_msource_tree   inm_srcs;      /* tree of sources */
-       u_long                   inm_nsrc;      /* # of tree entries */
-
-       struct ifqueue           inm_scq;       /* queue of pending
-                                                * state-change packets */
-       struct timeval           inm_lastgsrtv; /* Time of last G-S-R query */
-       uint16_t                 inm_sctimer;   /* state-change timer */
-       uint16_t                 inm_scrv;      /* state-change rexmit count */
+       struct igmp_ifinfo      *inm_igi;       /* IGMP info */
+       SLIST_ENTRY(in_multi)    inm_dtle;      /* detached waiting for rele */
+       SLIST_ENTRY(in_multi)    inm_nrele;     /* to-be-released by IGMP */
+       u_int32_t                inm_nrelecnt;  /* deferred release count */
+       struct ip_msource_tree   inm_srcs;      /* tree of sources */
+       u_long                   inm_nsrc;      /* # of tree entries */
+
+       struct ifqueue           inm_scq;       /* queue of pending
+                                                * state-change packets */
+       struct timeval           inm_lastgsrtv; /* Time of last G-S-R query */
+       uint16_t                 inm_sctimer;   /* state-change timer */
+       uint16_t                 inm_scrv;      /* state-change rexmit count */

 
        /*
         * SSM state counters which track state at T0 (the time the last
 
        /*
         * SSM state counters which track state at T0 (the time the last


@@ -341,47 +342,47 @@ struct in_multi {
         * are maintained here to optimize for common use-cases.
         */
        struct inm_st {
         * are maintained here to optimize for common use-cases.
         */
        struct inm_st {

-               uint16_t        iss_fmode;      /* IGMP filter mode */
-               uint16_t        iss_asm;        /* # of ASM listeners */
-               uint16_t        iss_ex;         /* # of exclusive members */
-               uint16_t        iss_in;         /* # of inclusive members */
-               uint16_t        iss_rec;        /* # of recorded sources */
-       }                       inm_st[2];      /* state at t0, t1 */
-
-       void (*inm_trace)               /* callback fn for tracing refs */
-           (struct in_multi *, int);
+               uint16_t        iss_fmode;      /* IGMP filter mode */
+               uint16_t        iss_asm;        /* # of ASM listeners */
+               uint16_t        iss_ex;         /* # of exclusive members */
+               uint16_t        iss_in;         /* # of inclusive members */
+               uint16_t        iss_rec;        /* # of recorded sources */
+       }                       inm_st[2];      /* state at t0, t1 */
+
+       void (*inm_trace)               /* callback fn for tracing refs */
+       (struct in_multi *, int);

 };
 
 };
 

-#define        INM_LOCK_ASSERT_HELD(_inm)                                      \
-       lck_mtx_assert(&(_inm)->inm_lock, LCK_MTX_ASSERT_OWNED)
+#define INM_LOCK_ASSERT_HELD(_inm)                                      \
+       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)
+#define INM_LOCK_ASSERT_NOTHELD(_inm)                                   \
+       LCK_MTX_ASSERT(&(_inm)->inm_lock, LCK_MTX_ASSERT_NOTOWNED)

 
 

-#define        INM_LOCK(_inm)                                                  \
+#define INM_LOCK(_inm)                                                  \

        lck_mtx_lock(&(_inm)->inm_lock)
 
        lck_mtx_lock(&(_inm)->inm_lock)
 

-#define        INM_LOCK_SPIN(_inm)                                             \
+#define INM_LOCK_SPIN(_inm)                                             \

        lck_mtx_lock_spin(&(_inm)->inm_lock)
 
        lck_mtx_lock_spin(&(_inm)->inm_lock)
 

-#define        INM_CONVERT_LOCK(_inm) do {                                     \
-       INM_LOCK_ASSERT_HELD(_inm);                                     \
-       lck_mtx_convert_spin(&(_inm)->inm_lock);                        \
+#define INM_CONVERT_LOCK(_inm) do {                                     \
+       INM_LOCK_ASSERT_HELD(_inm);                                     \
+       lck_mtx_convert_spin(&(_inm)->inm_lock);                        \

 } while (0)
 
 } while (0)
 

-#define        INM_UNLOCK(_inm)                                                \
+#define INM_UNLOCK(_inm)                                                \

        lck_mtx_unlock(&(_inm)->inm_lock)
 
        lck_mtx_unlock(&(_inm)->inm_lock)
 

-#define        INM_ADDREF(_inm)                                                \
+#define INM_ADDREF(_inm)                                                \

        inm_addref(_inm, 0)
 
        inm_addref(_inm, 0)
 

-#define        INM_ADDREF_LOCKED(_inm)                                         \
+#define INM_ADDREF_LOCKED(_inm)                                         \

        inm_addref(_inm, 1)
 
        inm_addref(_inm, 1)
 

-#define        INM_REMREF(_inm)                                                \
+#define INM_REMREF(_inm)                                                \

        inm_remref(_inm, 0)
 
        inm_remref(_inm, 0)
 

-#define        INM_REMREF_LOCKED(_inm)                                         \
+#define INM_REMREF_LOCKED(_inm)                                         \

        inm_remref(_inm, 1)
 
 #ifdef SYSCTL_DECL
        inm_remref(_inm, 1)
 
 #ifdef SYSCTL_DECL


@@ -413,24 +414,24 @@ struct in_multistep {
  *
  * Must be called with in_multihead_lock held.
  */
  *
  * Must be called with in_multihead_lock held.
  */

-#define        IN_LOOKUP_MULTI(addr, ifp, inm)                                 \
-       /* struct in_addr *addr; */                                     \
-       /* struct ifnet *ifp; */                                        \
-       /* struct in_multi *inm; */                                     \
-do {                                                                   \
-       struct in_multistep _step;                                      \
-       IN_FIRST_MULTI(_step, inm);                                     \
-       while ((inm) != NULL) {                                         \
-               INM_LOCK_SPIN(inm);                                     \
-               if ((inm)->inm_ifp == (ifp) &&                          \
-                   (inm)->inm_addr.s_addr == (addr)->s_addr) {         \
-                       INM_ADDREF_LOCKED(inm);                         \
-                       INM_UNLOCK(inm);                                \
-                       break;                                          \
-               }                                                       \
-               INM_UNLOCK(inm);                                        \
-               IN_NEXT_MULTI(_step, inm);                              \
-       }                                                               \
+#define IN_LOOKUP_MULTI(addr, ifp, inm)                                 \
+       /* struct in_addr *addr; */                                     \
+       /* struct ifnet *ifp; */                                        \
+       /* struct in_multi *inm; */                                     \
+do {                                                                    \
+       struct in_multistep _step;                                      \
+       IN_FIRST_MULTI(_step, inm);                                     \
+       while ((inm) != NULL) {                                         \
+               INM_LOCK_SPIN(inm);                                     \
+               if ((inm)->inm_ifp == (ifp) &&                          \
+                   (inm)->inm_addr.s_addr == (addr)->s_addr) {         \
+                       INM_ADDREF_LOCKED(inm);                         \
+                       INM_UNLOCK(inm);                                \
+                       break;                                          \
+               }                                                       \
+               INM_UNLOCK(inm);                                        \
+               IN_NEXT_MULTI(_step, inm);                              \
+       }                                                               \

 } while (0)
 
 /*
 } while (0)
 
 /*


@@ -442,22 +443,22 @@ do {                                                                      \
  *
  * Must be called with in_multihead_lock held.
  */
  *
  * Must be called with in_multihead_lock held.
  */

-#define        IN_NEXT_MULTI(step, inm)                                        \
-       /* struct in_multistep  step; */                                \
-       /* struct in_multi *inm; */                                     \
-do {                                                                   \
-       in_multihead_lock_assert(LCK_RW_ASSERT_HELD);                   \
-       if (((inm) = (step).i_inm) != NULL)                             \
-               (step).i_inm = LIST_NEXT((step).i_inm, inm_link);       \
+#define IN_NEXT_MULTI(step, inm)                                        \
+       /* struct in_multistep  step; */                                \
+       /* struct in_multi *inm; */                                     \
+do {                                                                    \
+       in_multihead_lock_assert(LCK_RW_ASSERT_HELD);                   \
+       if (((inm) = (step).i_inm) != NULL)                             \
+               (step).i_inm = LIST_NEXT((step).i_inm, inm_link);       \

 } while (0)
 
 } while (0)
 

-#define        IN_FIRST_MULTI(step, inm)                                       \
-       /* struct in_multistep step; */                                 \
-       /* struct in_multi *inm; */                                     \
-do {                                                                   \
-       in_multihead_lock_assert(LCK_RW_ASSERT_HELD);                   \
-       (step).i_inm = LIST_FIRST(&in_multihead);                       \
-       IN_NEXT_MULTI((step), (inm));                                   \
+#define IN_FIRST_MULTI(step, inm)                                       \
+       /* struct in_multistep step; */                                 \
+       /* struct in_multi *inm; */                                     \
+do {                                                                    \
+       in_multihead_lock_assert(LCK_RW_ASSERT_HELD);                   \
+       (step).i_inm = LIST_FIRST(&in_multihead);                       \
+       IN_NEXT_MULTI((step), (inm));                                   \

 } while (0)
 
 extern lck_mtx_t *inet_domain_mutex;
 } while (0)
 
 extern lck_mtx_t *inet_domain_mutex;


@@ -469,25 +470,28 @@ struct inpcb;
 /*
  * Return values for imo_multi_filter().
  */
 /*
  * Return values for imo_multi_filter().
  */

-#define        MCAST_PASS              0       /* Pass */
-#define        MCAST_NOTGMEMBER        1       /* This host not a member of group */
-#define        MCAST_NOTSMEMBER        2       /* This host excluded source */
-#define        MCAST_MUTED             3       /* [deprecated] */
+#define MCAST_PASS              0       /* Pass */
+#define MCAST_NOTGMEMBER        1       /* This host not a member of group */
+#define MCAST_NOTSMEMBER        2       /* This host excluded source */
+#define MCAST_MUTED             3       /* [deprecated] */

 
 /*
  * Per-interface IPv4 structures.
  */
 struct in_ifextra {
 
 /*
  * Per-interface IPv4 structures.
  */
 struct in_ifextra {

-       uint32_t                netsig_len;
-       u_int8_t                netsig[IFNET_SIGNATURELEN];
+       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 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 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 *);
 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 +519,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 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 *);
 extern void gre_input(struct mbuf *, int);
 extern void imf_leave(struct in_mfilter *);
 extern void imf_purge(struct in_mfilter *);