xnu-3789.51.2.tar.gz

[apple/xnu.git] / bsd / netinet / in_mcast.c

diff --git a/bsd/netinet/in_mcast.c b/bsd/netinet/in_mcast.c
index deded6a557428c3736b50902f3976acf8fffb659..1d1b56563e601d1b8e1765c049d92cd40f85b166 100644 (file)
--- a/bsd/netinet/in_mcast.c
+++ b/bsd/netinet/in_mcast.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2010-2016 Apple Inc. All rights reserved.

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


@@ -243,9 +243,6 @@ static void ipms_free(struct ip_msource *);
 static struct in_msource *inms_alloc(int);
 static void inms_free(struct in_msource *);
 
 static struct in_msource *inms_alloc(int);
 static void inms_free(struct in_msource *);
 

-#define        IMO_CAST_TO_NONCONST(x) ((struct ip_moptions *)(void *)(uintptr_t)x)
-#define        INM_CAST_TO_NONCONST(x) ((struct in_multi *)(void *)(uintptr_t)x)
-

 static __inline int
 ip_msource_cmp(const struct ip_msource *a, const struct ip_msource *b)
 {
 static __inline int
 ip_msource_cmp(const struct ip_msource *a, const struct ip_msource *b)
 {


@@ -345,7 +342,7 @@ imo_match_group(const struct ip_moptions *imo, const struct ifnet *ifp,
        int               idx;
        int               nmships;
 
        int               idx;
        int               nmships;
 

-       IMO_LOCK_ASSERT_HELD(IMO_CAST_TO_NONCONST(imo));
+       IMO_LOCK_ASSERT_HELD(__DECONST(struct ip_moptions *, imo));

 
        gsin = (struct sockaddr_in *)(uintptr_t)(size_t)group;
 
 
        gsin = (struct sockaddr_in *)(uintptr_t)(size_t)group;
 


@@ -388,7 +385,7 @@ imo_match_source(const struct ip_moptions *imo, const size_t gidx,
        struct ip_msource       *ims;
        const sockunion_t       *psa;
 
        struct ip_msource       *ims;
        const sockunion_t       *psa;
 

-       IMO_LOCK_ASSERT_HELD(IMO_CAST_TO_NONCONST(imo));
+       IMO_LOCK_ASSERT_HELD(__DECONST(struct ip_moptions *, imo));

 
        VERIFY(src->sa_family == AF_INET);
        VERIFY(gidx != (size_t)-1 && gidx < imo->imo_num_memberships);
 
        VERIFY(src->sa_family == AF_INET);
        VERIFY(gidx != (size_t)-1 && gidx < imo->imo_num_memberships);


@@ -420,7 +417,7 @@ imo_multi_filter(const struct ip_moptions *imo, const struct ifnet *ifp,
        struct in_msource *ims;
        int mode;
 
        struct in_msource *ims;
        int mode;
 

-       IMO_LOCK_ASSERT_HELD(IMO_CAST_TO_NONCONST(imo));
+       IMO_LOCK_ASSERT_HELD(__DECONST(struct ip_moptions *, imo));

        VERIFY(ifp != NULL);
 
        gidx = imo_match_group(imo, ifp, group);
        VERIFY(ifp != NULL);
 
        gidx = imo_match_group(imo, ifp, group);


@@ -861,7 +858,8 @@ imf_rollback(struct in_mfilter *imf)
                        lims->imsl_st[1] = lims->imsl_st[0];
                } else {
                        /* revert source added t1 */
                        lims->imsl_st[1] = lims->imsl_st[0];
                } else {
                        /* revert source added t1 */

-                       IGMP_PRINTF(("%s: free inms %p\n", __func__, lims));
+                       IGMP_PRINTF(("%s: free inms 0x%llx\n", __func__,
+                           (uint64_t)VM_KERNEL_ADDRPERM(lims)));

                        RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                        inms_free(lims);
                        imf->imf_nsrc--;
                        RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                        inms_free(lims);
                        imf->imf_nsrc--;


@@ -921,7 +919,8 @@ imf_reap(struct in_mfilter *imf)
                lims = (struct in_msource *)ims;
                if ((lims->imsl_st[0] == MCAST_UNDEFINED) &&
                    (lims->imsl_st[1] == MCAST_UNDEFINED)) {
                lims = (struct in_msource *)ims;
                if ((lims->imsl_st[0] == MCAST_UNDEFINED) &&
                    (lims->imsl_st[1] == MCAST_UNDEFINED)) {

-                       IGMP_PRINTF(("%s: free inms %p\n", __func__, lims));
+                       IGMP_PRINTF(("%s: free inms 0x%llx\n", __func__,
+                           (uint64_t)VM_KERNEL_ADDRPERM(lims)));

                        RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                        inms_free(lims);
                        imf->imf_nsrc--;
                        RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                        inms_free(lims);
                        imf->imf_nsrc--;


@@ -942,7 +941,8 @@ imf_purge(struct in_mfilter *imf)
 
        RB_FOREACH_SAFE(ims, ip_msource_tree, &imf->imf_sources, tims) {
                lims = (struct in_msource *)ims;
 
        RB_FOREACH_SAFE(ims, ip_msource_tree, &imf->imf_sources, tims) {
                lims = (struct in_msource *)ims;

-               IGMP_PRINTF(("%s: free inms %p\n", __func__, lims));
+               IGMP_PRINTF(("%s: free inms 0x%llx\n", __func__,
+                   (uint64_t)VM_KERNEL_ADDRPERM(lims)));

                RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                inms_free(lims);
                imf->imf_nsrc--;
                RB_REMOVE(ip_msource_tree, &imf->imf_sources, ims);
                inms_free(lims);
                imf->imf_nsrc--;


@@ -969,6 +969,7 @@ inm_get_source(struct in_multi *inm, const in_addr_t haddr,
        struct ip_msource       *ims, *nims;
 #ifdef IGMP_DEBUG
        struct in_addr ia;
        struct ip_msource       *ims, *nims;
 #ifdef IGMP_DEBUG
        struct in_addr ia;

+       char buf[MAX_IPv4_STR_LEN];

 #endif
        INM_LOCK_ASSERT_HELD(inm);
 
 #endif
        INM_LOCK_ASSERT_HELD(inm);
 


@@ -986,8 +987,9 @@ inm_get_source(struct in_multi *inm, const in_addr_t haddr,
                ims = nims;
 #ifdef IGMP_DEBUG
                ia.s_addr = htonl(haddr);
                ims = nims;
 #ifdef IGMP_DEBUG
                ia.s_addr = htonl(haddr);

-               IGMP_PRINTF(("%s: allocated %s as %p\n", __func__,
-                   inet_ntoa(ia), ims));
+               inet_ntop(AF_INET, &ia, buf, sizeof(buf));
+               IGMP_PRINTF(("%s: allocated %s as 0x%llx\n", __func__,
+                   buf, (uint64_t)VM_KERNEL_ADDRPERM(ims)));

 #endif
        }
 
 #endif
        }
 


@@ -1007,7 +1009,7 @@ uint8_t
 ims_get_mode(const struct in_multi *inm, const struct ip_msource *ims,
     uint8_t t)
 {
 ims_get_mode(const struct in_multi *inm, const struct ip_msource *ims,
     uint8_t t)
 {

-       INM_LOCK_ASSERT_HELD(INM_CAST_TO_NONCONST(inm));
+       INM_LOCK_ASSERT_HELD(__DECONST(struct in_multi *, inm));

 
        t = !!t;
        if (inm->inm_st[t].iss_ex > 0 &&
 
        t = !!t;
        if (inm->inm_st[t].iss_ex > 0 &&


@@ -1034,22 +1036,26 @@ ims_merge(struct ip_msource *ims, const struct in_msource *lims,
 #endif
 
        if (lims->imsl_st[0] == MCAST_EXCLUDE) {
 #endif
 
        if (lims->imsl_st[0] == MCAST_EXCLUDE) {

-               IGMP_PRINTF(("%s: t1 ex -= %d on %s\n",
-                   __func__, n, inet_ntoa(ia)));
+               IGMP_INET_PRINTF(ia,
+                   ("%s: t1 ex -= %d on %s\n",
+                   __func__, n, _igmp_inet_buf));

                ims->ims_st[1].ex -= n;
        } else if (lims->imsl_st[0] == MCAST_INCLUDE) {
                ims->ims_st[1].ex -= n;
        } else if (lims->imsl_st[0] == MCAST_INCLUDE) {

-               IGMP_PRINTF(("%s: t1 in -= %d on %s\n",
-                   __func__, n, inet_ntoa(ia)));
+               IGMP_INET_PRINTF(ia,
+                   ("%s: t1 in -= %d on %s\n",
+                   __func__, n, _igmp_inet_buf));

                ims->ims_st[1].in -= n;
        }
 
        if (lims->imsl_st[1] == MCAST_EXCLUDE) {
                ims->ims_st[1].in -= n;
        }
 
        if (lims->imsl_st[1] == MCAST_EXCLUDE) {

-               IGMP_PRINTF(("%s: t1 ex += %d on %s\n",
-                   __func__, n, inet_ntoa(ia)));
+               IGMP_INET_PRINTF(ia,
+                   ("%s: t1 ex += %d on %s\n",
+                   __func__, n, _igmp_inet_buf));

                ims->ims_st[1].ex += n;
        } else if (lims->imsl_st[1] == MCAST_INCLUDE) {
                ims->ims_st[1].ex += n;
        } else if (lims->imsl_st[1] == MCAST_INCLUDE) {

-               IGMP_PRINTF(("%s: t1 in += %d on %s\n",
-                   __func__, n, inet_ntoa(ia)));
+               IGMP_INET_PRINTF(ia,
+                   ("%s: t1 in += %d on %s\n",
+                   __func__, n, _igmp_inet_buf));

                ims->ims_st[1].in += n;
        }
 }
                ims->ims_st[1].in += n;
        }
 }


@@ -1183,7 +1189,9 @@ inm_merge(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
                inm->inm_st[1].iss_asm++;
        }
 
                inm->inm_st[1].iss_asm++;
        }
 

-       IGMP_PRINTF(("%s: merged imf %p to inm %p\n", __func__, imf, inm));
+       IGMP_PRINTF(("%s: merged imf 0x%llx to inm 0x%llx\n", __func__,
+           (uint64_t)VM_KERNEL_ADDRPERM(imf),
+           (uint64_t)VM_KERNEL_ADDRPERM(inm)));

        inm_print(inm);
 
 out_reap:
        inm_print(inm);
 
 out_reap:


@@ -1205,7 +1213,8 @@ inm_commit(struct in_multi *inm)
 
        INM_LOCK_ASSERT_HELD(inm);
 
 
        INM_LOCK_ASSERT_HELD(inm);
 

-       IGMP_PRINTF(("%s: commit inm %p\n", __func__, inm));
+       IGMP_PRINTF(("%s: commit inm 0x%llx\n", __func__,
+           (uint64_t)VM_KERNEL_ADDRPERM(inm)));

        IGMP_PRINTF(("%s: pre commit:\n", __func__));
        inm_print(inm);
 
        IGMP_PRINTF(("%s: pre commit:\n", __func__));
        inm_print(inm);
 


@@ -1230,7 +1239,8 @@ inm_reap(struct in_multi *inm)
                    ims->ims_st[1].ex > 0 || ims->ims_st[1].in > 0 ||
                    ims->ims_stp != 0)
                        continue;
                    ims->ims_st[1].ex > 0 || ims->ims_st[1].in > 0 ||
                    ims->ims_stp != 0)
                        continue;

-               IGMP_PRINTF(("%s: free ims %p\n", __func__, ims));
+               IGMP_PRINTF(("%s: free ims 0x%llx\n", __func__,
+                   (uint64_t)VM_KERNEL_ADDRPERM(ims)));

                RB_REMOVE(ip_msource_tree, &inm->inm_srcs, ims);
                ipms_free(ims);
                inm->inm_nsrc--;
                RB_REMOVE(ip_msource_tree, &inm->inm_srcs, ims);
                ipms_free(ims);
                inm->inm_nsrc--;


@@ -1248,7 +1258,8 @@ inm_purge(struct in_multi *inm)
        INM_LOCK_ASSERT_HELD(inm);
 
        RB_FOREACH_SAFE(ims, ip_msource_tree, &inm->inm_srcs, tims) {
        INM_LOCK_ASSERT_HELD(inm);
 
        RB_FOREACH_SAFE(ims, ip_msource_tree, &inm->inm_srcs, tims) {

-               IGMP_PRINTF(("%s: free ims %p\n", __func__, ims));
+               IGMP_PRINTF(("%s: free ims 0x%llx\n", __func__,
+                   (uint64_t)VM_KERNEL_ADDRPERM(ims)));

                RB_REMOVE(ip_msource_tree, &inm->inm_srcs, ims);
                ipms_free(ims);
                inm->inm_nsrc--;
                RB_REMOVE(ip_msource_tree, &inm->inm_srcs, ims);
                ipms_free(ims);
                inm->inm_nsrc--;


@@ -1271,10 +1282,12 @@ in_joingroup(struct ifnet *ifp, const struct in_addr *gina,
        struct in_mfilter        timf;
        struct in_multi         *inm = NULL;
        int                      error = 0;
        struct in_mfilter        timf;
        struct in_multi         *inm = NULL;
        int                      error = 0;

+       struct igmp_tparams      itp;

 
 

-       IGMP_PRINTF(("%s: join %s on %p(%s%d))\n", __func__,
-           inet_ntoa(*gina), ifp, ifp->if_name, ifp->if_unit));
+       IGMP_INET_PRINTF(*gina, ("%s: join %s on 0x%llx(%s))\n", __func__,
+           _igmp_inet_buf, (uint64_t)VM_KERNEL_ADDRPERM(ifp), if_name(ifp)));

 
 

+       bzero(&itp, sizeof (itp));

        *pinm = NULL;
 
        /*
        *pinm = NULL;
 
        /*


@@ -1302,15 +1315,17 @@ in_joingroup(struct ifnet *ifp, const struct in_addr *gina,
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-       error = igmp_change_state(inm);
+       error = igmp_change_state(inm, &itp);

        if (error) {
                IGMP_PRINTF(("%s: failed to update source\n", __func__));
        if (error) {
                IGMP_PRINTF(("%s: failed to update source\n", __func__));

+               imf_rollback(imf);

                goto out_inm_release;
        }
 
 out_inm_release:
        if (error) {
                goto out_inm_release;
        }
 
 out_inm_release:
        if (error) {

-               IGMP_PRINTF(("%s: dropping ref on %p\n", __func__, inm));
+               IGMP_PRINTF(("%s: dropping ref on 0x%llx\n", __func__,
+                   (uint64_t)VM_KERNEL_ADDRPERM(inm)));

                INM_UNLOCK(inm);
                INM_REMREF(inm);
        } else {
                INM_UNLOCK(inm);
                INM_REMREF(inm);
        } else {


@@ -1318,6 +1333,9 @@ out_inm_release:
                *pinm = inm;    /* keep refcount from in_getmulti() */
        }
 
                *pinm = inm;    /* keep refcount from in_getmulti() */
        }
 

+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -1335,7 +1353,9 @@ in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
 {
        struct in_mfilter        timf;
        int                      error, lastref;
 {
        struct in_mfilter        timf;
        int                      error, lastref;

+       struct igmp_tparams      itp;

 
 

+       bzero(&itp, sizeof (itp));

        error = 0;
 
        INM_LOCK_ASSERT_NOTHELD(inm);
        error = 0;
 
        INM_LOCK_ASSERT_NOTHELD(inm);


@@ -1343,10 +1363,11 @@ in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
         in_multihead_lock_exclusive();
         INM_LOCK(inm);
 
         in_multihead_lock_exclusive();
         INM_LOCK(inm);
 

-       IGMP_PRINTF(("%s: leave inm %p, %s/%s%d, imf %p\n", __func__,
-           inm, inet_ntoa(inm->inm_addr),
+       IGMP_INET_PRINTF(inm->inm_addr,
+           ("%s: leave inm 0x%llx, %s/%s%d, imf 0x%llx\n", __func__,
+           (uint64_t)VM_KERNEL_ADDRPERM(inm), _igmp_inet_buf,

            (inm_is_ifp_detached(inm) ? "null" : inm->inm_ifp->if_name),
            (inm_is_ifp_detached(inm) ? "null" : inm->inm_ifp->if_name),

-           inm->inm_ifp->if_unit, imf));
+           inm->inm_ifp->if_unit, (uint64_t)VM_KERNEL_ADDRPERM(imf)));

 
        /*
         * If no imf was specified (i.e. kernel consumer),
 
        /*
         * If no imf was specified (i.e. kernel consumer),


@@ -1370,7 +1391,7 @@ in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
        KASSERT(error == 0, ("%s: failed to merge inm state\n", __func__));
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
        KASSERT(error == 0, ("%s: failed to merge inm state\n", __func__));
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-       error = igmp_change_state(inm);
+       error = igmp_change_state(inm, &itp);

 #if IGMP_DEBUG
        if (error)
                IGMP_PRINTF(("%s: failed igmp downcall\n", __func__));
 #if IGMP_DEBUG
        if (error)
                IGMP_PRINTF(("%s: failed igmp downcall\n", __func__));


@@ -1384,6 +1405,9 @@ in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
         if (lastref)
                INM_REMREF(inm);        /* for in_multihead list */
 
         if (lastref)
                INM_REMREF(inm);        /* for in_multihead list */
 

+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -1441,7 +1465,9 @@ inp_block_unblock_source(struct inpcb *inp, struct sockopt *sopt)
        uint16_t                         fmode;
        int                              error, doblock;
        unsigned int                     ifindex = 0;
        uint16_t                         fmode;
        int                              error, doblock;
        unsigned int                     ifindex = 0;

+       struct igmp_tparams              itp;

 
 

+       bzero(&itp, sizeof (itp));

        ifp = NULL;
        error = 0;
        doblock = 0;
        ifp = NULL;
        error = 0;
        doblock = 0;


@@ -1475,8 +1501,9 @@ inp_block_unblock_source(struct inpcb *inp, struct sockopt *sopt)
                if (sopt->sopt_name == IP_BLOCK_SOURCE)
                        doblock = 1;
 
                if (sopt->sopt_name == IP_BLOCK_SOURCE)
                        doblock = 1;
 

-               IGMP_PRINTF(("%s: imr_interface = %s, ifp = %p\n",
-                   __func__, inet_ntoa(mreqs.imr_interface), ifp));
+               IGMP_INET_PRINTF(mreqs.imr_interface,
+                   ("%s: imr_interface = %s, ifp = 0x%llx\n", __func__,
+                   _igmp_inet_buf, (uint64_t)VM_KERNEL_ADDRPERM(ifp)));

                break;
            }
 
                break;
            }
 


@@ -1517,7 +1544,6 @@ inp_block_unblock_source(struct inpcb *inp, struct sockopt *sopt)
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);

-               break;

        }
 
        if (!IN_MULTICAST(ntohl(gsa->sin.sin_addr.s_addr)))
        }
 
        if (!IN_MULTICAST(ntohl(gsa->sin.sin_addr.s_addr)))


@@ -1559,8 +1585,9 @@ inp_block_unblock_source(struct inpcb *inp, struct sockopt *sopt)
         */
        ims = imo_match_source(imo, idx, &ssa->sa);
        if ((ims != NULL && doblock) || (ims == NULL && !doblock)) {
         */
        ims = imo_match_source(imo, idx, &ssa->sa);
        if ((ims != NULL && doblock) || (ims == NULL && !doblock)) {

-               IGMP_PRINTF(("%s: source %s %spresent\n", __func__,
-                   inet_ntoa(ssa->sin.sin_addr), doblock ? "" : "not "));
+               IGMP_INET_PRINTF(ssa->sin.sin_addr,
+                   ("%s: source %s %spresent\n", __func__,
+                   _igmp_inet_buf, doblock ? "" : "not "));

                error = EADDRNOTAVAIL;
                goto out_imo_locked;
        }
                error = EADDRNOTAVAIL;
                goto out_imo_locked;
        }


@@ -1596,7 +1623,7 @@ inp_block_unblock_source(struct inpcb *inp, struct sockopt *sopt)
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-       error = igmp_change_state(inm);
+       error = igmp_change_state(inm, &itp);

        INM_UNLOCK(inm);
 #if IGMP_DEBUG
        if (error)
        INM_UNLOCK(inm);
 #if IGMP_DEBUG
        if (error)


@@ -1614,6 +1641,10 @@ out_imf_rollback:
 out_imo_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */
 out_imo_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */

+
+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -1705,7 +1736,7 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt)
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */

-               memcpy(&msfr, &msfr64, sizeof(msfr));
+               memcpy(&msfr, &msfr64, sizeof(msfr64));

        } else {
                error = sooptcopyin(sopt, &msfr32,
                    sizeof(struct __msfilterreq32),
        } else {
                error = sooptcopyin(sopt, &msfr32,
                    sizeof(struct __msfilterreq32),


@@ -1713,7 +1744,7 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt)
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */

-               memcpy(&msfr, &msfr32, sizeof(msfr));
+               memcpy(&msfr, &msfr32, sizeof(msfr32));

        }
 
        ifnet_head_lock_shared();
        }
 
        ifnet_head_lock_shared();


@@ -1729,8 +1760,8 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt)
                return (EADDRNOTAVAIL);
 
        if ((size_t) msfr.msfr_nsrcs >
                return (EADDRNOTAVAIL);
 
        if ((size_t) msfr.msfr_nsrcs >

-           SIZE_MAX / sizeof(struct sockaddr_storage))
-               msfr.msfr_nsrcs = SIZE_MAX / sizeof(struct sockaddr_storage);
+           UINT32_MAX / sizeof(struct sockaddr_storage))
+               msfr.msfr_nsrcs = UINT32_MAX / sizeof(struct sockaddr_storage);

 
        if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
                msfr.msfr_nsrcs = in_mcast_maxsocksrc;
 
        if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
                msfr.msfr_nsrcs = in_mcast_maxsocksrc;


@@ -1777,7 +1808,6 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt)
                        IMO_UNLOCK(imo);
                        return (ENOBUFS);
                }
                        IMO_UNLOCK(imo);
                        return (ENOBUFS);
                }

-               bzero(tss, (size_t) msfr.msfr_nsrcs * sizeof(*tss));

        }
 
        /*
        }
 
        /*


@@ -1826,7 +1856,7 @@ inp_get_source_filters(struct inpcb *inp, struct sockopt *sopt)
                msfr32.msfr_ifindex = msfr.msfr_ifindex;
                msfr32.msfr_fmode   = msfr.msfr_fmode;
                msfr32.msfr_nsrcs   = msfr.msfr_nsrcs;
                msfr32.msfr_ifindex = msfr.msfr_ifindex;
                msfr32.msfr_fmode   = msfr.msfr_fmode;
                msfr32.msfr_nsrcs   = msfr.msfr_nsrcs;

-               memcpy(&msfr64.msfr_group, &msfr.msfr_group,
+               memcpy(&msfr32.msfr_group, &msfr.msfr_group,

                    sizeof(struct sockaddr_storage));
                error = sooptcopyout(sopt, &msfr32,
                    sizeof(struct __msfilterreq32));
                    sizeof(struct sockaddr_storage));
                error = sooptcopyout(sopt, &msfr32,
                    sizeof(struct __msfilterreq32));


@@ -1854,26 +1884,14 @@ inp_getmoptions(struct inpcb *inp, struct sockopt *sopt)
         * If socket is neither of type SOCK_RAW or SOCK_DGRAM,
         * or is a divert socket, reject it.
         */
         * If socket is neither of type SOCK_RAW or SOCK_DGRAM,
         * or is a divert socket, reject it.
         */

-       if (inp->inp_socket->so_proto->pr_protocol == IPPROTO_DIVERT ||
-           (inp->inp_socket->so_proto->pr_type != SOCK_RAW &&
-           inp->inp_socket->so_proto->pr_type != SOCK_DGRAM)) {
+       if (SOCK_PROTO(inp->inp_socket) == IPPROTO_DIVERT ||
+           (SOCK_TYPE(inp->inp_socket) != SOCK_RAW &&
+           SOCK_TYPE(inp->inp_socket) != SOCK_DGRAM)) {

                return (EOPNOTSUPP);
        }
 
        error = 0;
        switch (sopt->sopt_name) {
                return (EOPNOTSUPP);
        }
 
        error = 0;
        switch (sopt->sopt_name) {

-#ifdef MROUTING
-       case IP_MULTICAST_VIF:
-               if (imo != NULL) {
-                       IMO_LOCK(imo);
-                       optval = imo->imo_multicast_vif;
-                       IMO_UNLOCK(imo);
-               } else
-                       optval = -1;
-               error = sooptcopyout(sopt, &optval, sizeof(int));
-               break;
-#endif /* MROUTING */
-

        case IP_MULTICAST_IF:
                memset(&mreqn, 0, sizeof(struct ip_mreqn));
                if (imo != NULL) {
        case IP_MULTICAST_IF:
                memset(&mreqn, 0, sizeof(struct ip_mreqn));
                if (imo != NULL) {


@@ -2009,7 +2027,6 @@ inp_lookup_mcast_ifp(const struct inpcb *inp,
                if (ro.ro_rt != NULL) {
                        ifp = ro.ro_rt->rt_ifp;
                        VERIFY(ifp != NULL);
                if (ro.ro_rt != NULL) {
                        ifp = ro.ro_rt->rt_ifp;
                        VERIFY(ifp != NULL);

-                       rtfree(ro.ro_rt);

                } else {
                        struct in_ifaddr *ia;
                        struct ifnet *mifp;
                } else {
                        struct in_ifaddr *ia;
                        struct ifnet *mifp;


@@ -2028,6 +2045,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp,
                        }
                        lck_rw_done(in_ifaddr_rwlock);
                }
                        }
                        lck_rw_done(in_ifaddr_rwlock);
                }

+               ROUTE_RELEASE(&ro);

        }
 
        return (ifp);
        }
 
        return (ifp);


@@ -2053,7 +2071,9 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
        struct in_msource               *lims;
        size_t                           idx;
        int                              error, is_new;
        struct in_msource               *lims;
        size_t                           idx;
        int                              error, is_new;

+       struct igmp_tparams              itp;

 
 

+       bzero(&itp, sizeof (itp));

        ifp = NULL;
        imf = NULL;
        error = 0;
        ifp = NULL;
        imf = NULL;
        error = 0;


@@ -2107,8 +2127,9 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
 
                ifp = inp_lookup_mcast_ifp(inp, &gsa->sin,
                    mreqs.imr_interface);
 
                ifp = inp_lookup_mcast_ifp(inp, &gsa->sin,
                    mreqs.imr_interface);

-               IGMP_PRINTF(("%s: imr_interface = %s, ifp = %p\n",
-                   __func__, inet_ntoa(mreqs.imr_interface), ifp));
+               IGMP_INET_PRINTF(mreqs.imr_interface,
+                   ("%s: imr_interface = %s, ifp = 0x%llx\n", __func__,
+                   _igmp_inet_buf, (uint64_t)VM_KERNEL_ADDRPERM(ifp)));

                break;
        }
 
                break;
        }
 


@@ -2160,7 +2181,6 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);

-               break;

        }
 
        if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0)
        }
 
        if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0)


@@ -2287,10 +2307,24 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
        /*
         * Begin state merge transaction at IGMP layer.
         */
        /*
         * Begin state merge transaction at IGMP layer.
         */

-

        if (is_new) {
        if (is_new) {

+               /*
+                * Unlock socket as we may end up calling ifnet_ioctl() to join (or leave)
+                * the multicast group and we run the risk of a lock ordering issue
+                * if the ifnet thread calls into the socket layer to acquire the pcb list
+                * lock while the input thread delivers multicast packets
+                */
+               IMO_ADDREF_LOCKED(imo);
+               IMO_UNLOCK(imo);
+               socket_unlock(inp->inp_socket, 0);
+

                VERIFY(inm == NULL);
                error = in_joingroup(ifp, &gsa->sin.sin_addr, imf, &inm);
                VERIFY(inm == NULL);
                error = in_joingroup(ifp, &gsa->sin.sin_addr, imf, &inm);

+
+               socket_lock(inp->inp_socket, 0);
+               IMO_REMREF(imo);
+               IMO_LOCK(imo);
+

                VERIFY(inm != NULL || error != 0);
                if (error)
                        goto out_imo_free;
                VERIFY(inm != NULL || error != 0);
                if (error)
                        goto out_imo_free;


@@ -2306,7 +2340,7 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt)
                        goto out_imf_rollback;
                }
                IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
                        goto out_imf_rollback;
                }
                IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-               error = igmp_change_state(inm);
+               error = igmp_change_state(inm, &itp);

                INM_UNLOCK(inm);
                if (error) {
                        IGMP_PRINTF(("%s: failed igmp downcall\n",
                INM_UNLOCK(inm);
                if (error) {
                        IGMP_PRINTF(("%s: failed igmp downcall\n",


@@ -2336,6 +2370,10 @@ out_imo_free:
 out_imo_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */
 out_imo_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */

+
+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -2359,7 +2397,9 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
        size_t                           idx;
        int                              error, is_final;
        unsigned int                     ifindex = 0;
        size_t                           idx;
        int                              error, is_final;
        unsigned int                     ifindex = 0;

+       struct igmp_tparams              itp;

 
 

+       bzero(&itp, sizeof (itp));

        ifp = NULL;
        error = 0;
        is_final = 1;
        ifp = NULL;
        error = 0;
        is_final = 1;


@@ -2411,8 +2451,9 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
                if (!in_nullhost(mreqs.imr_interface))
                        ifp = ip_multicast_if(&mreqs.imr_interface, &ifindex);
 
                if (!in_nullhost(mreqs.imr_interface))
                        ifp = ip_multicast_if(&mreqs.imr_interface, &ifindex);
 

-               IGMP_PRINTF(("%s: imr_interface = %s, ifp = %p\n",
-                   __func__, inet_ntoa(mreqs.imr_interface), ifp));
+               IGMP_INET_PRINTF(mreqs.imr_interface,
+                   ("%s: imr_interface = %s, ifp = 0x%llx\n", __func__,
+                   _igmp_inet_buf, (uint64_t)VM_KERNEL_ADDRPERM(ifp)));

 
                break;
 
 
                break;
 


@@ -2455,7 +2496,6 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);
                IGMP_PRINTF(("%s: unknown sopt_name %d\n",
                    __func__, sopt->sopt_name));
                return (EOPNOTSUPP);

-               break;

        }
 
        if (!IN_MULTICAST(ntohl(gsa->sin.sin_addr.s_addr)))
        }
 
        if (!IN_MULTICAST(ntohl(gsa->sin.sin_addr.s_addr)))


@@ -2500,8 +2540,9 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
                }
                ims = imo_match_source(imo, idx, &ssa->sa);
                if (ims == NULL) {
                }
                ims = imo_match_source(imo, idx, &ssa->sa);
                if (ims == NULL) {

-                       IGMP_PRINTF(("%s: source %s %spresent\n", __func__,
-                           inet_ntoa(ssa->sin.sin_addr), "not "));
+                       IGMP_INET_PRINTF(ssa->sin.sin_addr,
+                           ("%s: source %s %spresent\n", __func__,
+                           _igmp_inet_buf, "not "));

                        error = EADDRNOTAVAIL;
                        goto out_locked;
                }
                        error = EADDRNOTAVAIL;
                        goto out_locked;
                }


@@ -2518,6 +2559,7 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
         * Begin state merge transaction at IGMP layer.
         */
 
         * Begin state merge transaction at IGMP layer.
         */
 

+

        if (is_final) {
                /*
                 * Give up the multicast address record to which
        if (is_final) {
                /*
                 * Give up the multicast address record to which


@@ -2537,7 +2579,7 @@ inp_leave_group(struct inpcb *inp, struct sockopt *sopt)
                }
 
                IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
                }
 
                IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-               error = igmp_change_state(inm);
+               error = igmp_change_state(inm, &itp);

                if (error) {
                        IGMP_PRINTF(("%s: failed igmp downcall\n", __func__));
                }
                if (error) {
                        IGMP_PRINTF(("%s: failed igmp downcall\n", __func__));
                }


@@ -2553,10 +2595,23 @@ out_imf_rollback:
        imf_reap(imf);
 
        if (is_final) {
        imf_reap(imf);
 
        if (is_final) {

-               /* Remove the gap in the membership and filter array. */
+               /* Remove the gap in the membership array. */

                VERIFY(inm == imo->imo_membership[idx]);
                imo->imo_membership[idx] = NULL;
                VERIFY(inm == imo->imo_membership[idx]);
                imo->imo_membership[idx] = NULL;

+
+               /*
+                * See inp_join_group() for why we need to unlock
+                */
+               IMO_ADDREF_LOCKED(imo);
+               IMO_UNLOCK(imo);
+               socket_unlock(inp->inp_socket, 0);
+

                INM_REMREF(inm);
                INM_REMREF(inm);

+
+               socket_lock(inp->inp_socket, 0);
+               IMO_REMREF(imo);
+               IMO_LOCK(imo);
+

                for (++idx; idx < imo->imo_num_memberships; ++idx) {
                        imo->imo_membership[idx-1] = imo->imo_membership[idx];
                        imo->imo_mfilters[idx-1] = imo->imo_mfilters[idx];
                for (++idx; idx < imo->imo_num_memberships; ++idx) {
                        imo->imo_membership[idx-1] = imo->imo_membership[idx];
                        imo->imo_mfilters[idx-1] = imo->imo_mfilters[idx];


@@ -2567,6 +2622,10 @@ out_imf_rollback:
 out_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */
 out_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */

+
+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -2628,14 +2687,16 @@ inp_set_multicast_if(struct inpcb *inp, struct sockopt *sopt)
                } else {
                        ifp = ip_multicast_if(&addr, &ifindex);
                        if (ifp == NULL) {
                } else {
                        ifp = ip_multicast_if(&addr, &ifindex);
                        if (ifp == NULL) {

-                               IGMP_PRINTF(("%s: can't find ifp for addr=%s\n",
-                                   __func__, inet_ntoa(addr)));
+                               IGMP_INET_PRINTF(addr,
+                                   ("%s: can't find ifp for addr=%s\n",
+                                   __func__, _igmp_inet_buf));

                                return (EADDRNOTAVAIL);
                        }
                }
                                return (EADDRNOTAVAIL);
                        }
                }

+               /* XXX remove? */

 #ifdef IGMP_DEBUG0
 #ifdef IGMP_DEBUG0

-               IGMP_PRINTF(("%s: ifp = %p, addr = %s\n", __func__, ifp,
-                   inet_ntoa(addr)));
+               IGMP_PRINTF(("%s: ifp = 0x%llx, addr = %s\n", __func__,
+                   (uint64_t)VM_KERNEL_ADDRPERM(ifp), inet_ntoa(addr)));

 #endif
        }
 
 #endif
        }
 


@@ -2672,9 +2733,12 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt)
        struct in_mfilter       *imf;
        struct ip_moptions      *imo;
        struct in_multi         *inm;
        struct in_mfilter       *imf;
        struct ip_moptions      *imo;
        struct in_multi         *inm;

-       size_t                   idx;
+       size_t                   idx;

        int                      error;
        int                      error;

-       user_addr_t              tmp_ptr;
+       user_addr_t              tmp_ptr;
+       struct igmp_tparams      itp;
+
+       bzero(&itp, sizeof (itp));

 
        if (IS_64BIT_PROCESS(current_proc())) {
                error = sooptcopyin(sopt, &msfr64,
 
        if (IS_64BIT_PROCESS(current_proc())) {
                error = sooptcopyin(sopt, &msfr64,


@@ -2683,7 +2747,7 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt)
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */

-               memcpy(&msfr, &msfr64, sizeof(msfr));
+               memcpy(&msfr, &msfr64, sizeof(msfr64));

        } else {
                error = sooptcopyin(sopt, &msfr32,
                    sizeof(struct __msfilterreq32),
        } else {
                error = sooptcopyin(sopt, &msfr32,
                    sizeof(struct __msfilterreq32),


@@ -2691,12 +2755,12 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt)
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */
                if (error)
                        return (error);
                /* we never use msfr.msfr_srcs; */

-               memcpy(&msfr, &msfr32, sizeof(msfr));
+               memcpy(&msfr, &msfr32, sizeof(msfr32));

        }
 
        if ((size_t) msfr.msfr_nsrcs >
        }
 
        if ((size_t) msfr.msfr_nsrcs >

-           SIZE_MAX / sizeof(struct sockaddr_storage))
-               msfr.msfr_nsrcs = SIZE_MAX / sizeof(struct sockaddr_storage);
+           UINT32_MAX / sizeof(struct sockaddr_storage))
+               msfr.msfr_nsrcs = UINT32_MAX / sizeof(struct sockaddr_storage);

 
        if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
                return (ENOBUFS);
 
        if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
                return (ENOBUFS);


@@ -2834,7 +2898,7 @@ inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt)
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));
        }
 
        IGMP_PRINTF(("%s: doing igmp downcall\n", __func__));

-       error = igmp_change_state(inm);
+       error = igmp_change_state(inm, &itp);

        INM_UNLOCK(inm);
 #ifdef IGMP_DEBUG
        if (error)
        INM_UNLOCK(inm);
 #ifdef IGMP_DEBUG
        if (error)


@@ -2853,6 +2917,9 @@ out_imo_locked:
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */
 
        IMO_UNLOCK(imo);
        IMO_REMREF(imo);        /* from inp_findmoptions() */
 

+       /* schedule timer now that we've dropped the lock(s) */
+       igmp_set_timeout(&itp);
+

        return (error);
 }
 
        return (error);
 }
 


@@ -2864,9 +2931,6 @@ out_imo_locked:
  * it is not possible to merge the duplicate code, because the idempotence
  * of the IPv4 multicast part of the BSD Sockets API must be preserved;
  * the effects of these options must be treated as separate and distinct.
  * it is not possible to merge the duplicate code, because the idempotence
  * of the IPv4 multicast part of the BSD Sockets API must be preserved;
  * the effects of these options must be treated as separate and distinct.

- *
- * FUTURE: The IP_MULTICAST_VIF option may be eliminated if MROUTING
- * is refactored to no longer use vifs.

  */
 int
 inp_setmoptions(struct inpcb *inp, struct sockopt *sopt)
  */
 int
 inp_setmoptions(struct inpcb *inp, struct sockopt *sopt)


@@ -2882,42 +2946,12 @@ inp_setmoptions(struct inpcb *inp, struct sockopt *sopt)
         * If socket is neither of type SOCK_RAW or SOCK_DGRAM,
         * or is a divert socket, reject it.
         */
         * If socket is neither of type SOCK_RAW or SOCK_DGRAM,
         * or is a divert socket, reject it.
         */

-       if (inp->inp_socket->so_proto->pr_protocol == IPPROTO_DIVERT ||
-           (inp->inp_socket->so_proto->pr_type != SOCK_RAW &&
-            inp->inp_socket->so_proto->pr_type != SOCK_DGRAM))
+       if (SOCK_PROTO(inp->inp_socket) == IPPROTO_DIVERT ||
+           (SOCK_TYPE(inp->inp_socket) != SOCK_RAW &&
+            SOCK_TYPE(inp->inp_socket) != SOCK_DGRAM))

                return (EOPNOTSUPP);
 
        switch (sopt->sopt_name) {
                return (EOPNOTSUPP);
 
        switch (sopt->sopt_name) {

-#if MROUTING
-       case IP_MULTICAST_VIF: {
-               int vifi;
-               /*
-                * Select a multicast VIF for transmission.
-                * Only useful if multicast forwarding is active.
-                */
-               if (legal_vif_num == NULL) {
-                       error = EOPNOTSUPP;
-                       break;
-               }
-               error = sooptcopyin(sopt, &vifi, sizeof(int), sizeof(int));
-               if (error)
-                       break;
-               if (!legal_vif_num(vifi) && (vifi != -1)) {
-                       error = EINVAL;
-                       break;
-               }
-               imo = inp_findmoptions(inp);
-               if (imo == NULL) {
-                       error = ENOMEM;
-                       break;
-               }
-               IMO_LOCK(imo);
-               imo->imo_multicast_vif = vifi;
-               IMO_UNLOCK(imo);
-               IMO_REMREF(imo);        /* from inp_findmoptions() */
-               break;
-       }
-#endif

        case IP_MULTICAST_IF:
                error = inp_set_multicast_if(inp, sopt);
                break;
        case IP_MULTICAST_IF:
                error = inp_set_multicast_if(inp, sopt);
                break;


@@ -3129,8 +3163,9 @@ sysctl_ip_mcast_filters SYSCTL_HANDLER_ARGS
 
        group.s_addr = name[1];
        if (!IN_MULTICAST(ntohl(group.s_addr))) {
 
        group.s_addr = name[1];
        if (!IN_MULTICAST(ntohl(group.s_addr))) {

-               IGMP_PRINTF(("%s: group %s is not multicast\n",
-                   __func__, inet_ntoa(group)));
+               IGMP_INET_PRINTF(group,
+                   ("%s: group %s is not multicast\n",
+                   __func__, _igmp_inet_buf));

                ifnet_head_done();
                return (EINVAL);
        }
                ifnet_head_done();
                return (EINVAL);
        }


@@ -3162,8 +3197,8 @@ sysctl_ip_mcast_filters SYSCTL_HANDLER_ARGS
 #ifdef IGMP_DEBUG
                        struct in_addr ina;
                        ina.s_addr = htonl(ims->ims_haddr);
 #ifdef IGMP_DEBUG
                        struct in_addr ina;
                        ina.s_addr = htonl(ims->ims_haddr);

-                       IGMP_PRINTF(("%s: visit node %s\n", __func__,
-                           inet_ntoa(ina)));
+                       IGMP_INET_PRINTF(ina,
+                           ("%s: visit node %s\n", __func__, _igmp_inet_buf));

 #endif
                        /*
                         * Only copy-out sources which are in-mode.
 #endif
                        /*
                         * Only copy-out sources which are in-mode.


@@ -3597,6 +3632,7 @@ inm_mode_str(const int mode)
 static const char *inm_statestrs[] = {
        "not-member\n",
        "silent\n",
 static const char *inm_statestrs[] = {
        "not-member\n",
        "silent\n",

+       "reporting\n",

        "idle\n",
        "lazy\n",
        "sleeping\n",
        "idle\n",
        "lazy\n",
        "sleeping\n",


@@ -3621,26 +3657,28 @@ void
 inm_print(const struct in_multi *inm)
 {
        int t;
 inm_print(const struct in_multi *inm)
 {
        int t;

+       char buf[MAX_IPv4_STR_LEN];

 
 

-       INM_LOCK_ASSERT_HELD(INM_CAST_TO_NONCONST(inm));
+       INM_LOCK_ASSERT_HELD(__DECONST(struct in_multi *, inm));

 
        if (igmp_debug == 0)
                return;
 
 
        if (igmp_debug == 0)
                return;
 

-       printf("%s: --- begin inm %p ---\n", __func__, inm);
-       printf("addr %s ifp %p(%s%d) ifma %p\n",
-           inet_ntoa(inm->inm_addr),
-           inm->inm_ifp,
-           inm->inm_ifp->if_name,
-           inm->inm_ifp->if_unit,
-           inm->inm_ifma);
+       inet_ntop(AF_INET, &inm->inm_addr, buf, sizeof(buf));
+       printf("%s: --- begin inm 0x%llx ---\n", __func__,
+           (uint64_t)VM_KERNEL_ADDRPERM(inm));
+       printf("addr %s ifp 0x%llx(%s) ifma 0x%llx\n",
+           buf,
+           (uint64_t)VM_KERNEL_ADDRPERM(inm->inm_ifp),
+           if_name(inm->inm_ifp),
+           (uint64_t)VM_KERNEL_ADDRPERM(inm->inm_ifma));

        printf("timer %u state %s refcount %u scq.len %u\n",
            inm->inm_timer,
            inm_state_str(inm->inm_state),
            inm->inm_refcount,
            inm->inm_scq.ifq_len);
        printf("timer %u state %s refcount %u scq.len %u\n",
            inm->inm_timer,
            inm_state_str(inm->inm_state),
            inm->inm_refcount,
            inm->inm_scq.ifq_len);

-       printf("igi %p nsrc %lu sctimer %u scrv %u\n",
-           inm->inm_igi,
+       printf("igi 0x%llx nsrc %lu sctimer %u scrv %u\n",
+           (uint64_t)VM_KERNEL_ADDRPERM(inm->inm_igi),

            inm->inm_nsrc,
            inm->inm_sctimer,
            inm->inm_scrv);
            inm->inm_nsrc,
            inm->inm_sctimer,
            inm->inm_scrv);


@@ -3652,7 +3690,8 @@ inm_print(const struct in_multi *inm)
                    inm->inm_st[t].iss_in,
                    inm->inm_st[t].iss_rec);
        }
                    inm->inm_st[t].iss_in,
                    inm->inm_st[t].iss_rec);
        }

-       printf("%s: --- end inm %p ---\n", __func__, inm);
+       printf("%s: --- end inm 0x%llx ---\n", __func__,
+           (uint64_t)VM_KERNEL_ADDRPERM(inm));

 }
 
 #else
 }
 
 #else