Merge pull request #10400 from opensourcerouting/pim6-compilefix

pim6d: get running with ipv6 types throughout

diff --cc pimd/pim_bsm.c
Simple merge

diff --cc pimd/pim_cmd.c
index 83ba74f69fd3728b8fb7d9ddf30a6d06265dce55,bf65e943fc6fd798872c66ebe5ab50e28bb7d10d..3e3074827fe0110454955a54f5e58f3f47d9b244
--- 1/pimd/pim_cmd.c
--- 2/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@@ -8236,9 -8238,9 +8238,10 @@@ DEFPY_HIDDEN (interface_ip_igmp_query_g
              "IGMP version\n"
              "IGMP version number\n")
  {
+ #if PIM_IPV == 4
        VTY_DECLVAR_CONTEXT(interface, ifp);
 -      int igmp_version = 2;
 +      int igmp_version;
 +      struct pim_interface *pim_ifp = ifp->info;
  
        if (!ifp->info) {
                vty_out(vty, "IGMP/PIM is not enabled on the interface %s\n",

diff --cc pimd/pim_iface.c
index 57fe97816ec5ed8c25547b1ea3ddcd67d689aade,3e24e696396e4047850abd9f197780ca50593178..d6016d060b9d9ccf693237591107406949029272
--- 1/pimd/pim_iface.c
--- 2/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@@ -217,7 -225,15 +225,8 @@@ void pim_if_delete(struct interface *if
        list_delete(&pim_ifp->sec_addr_list);
  
        XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist);
 -
 -      while (!RB_EMPTY(pim_ifchannel_rb, &pim_ifp->ifchannel_rb)) {
 -              ch = RB_ROOT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb);
 -
 -              pim_ifchannel_delete(ch);
 -      }
 -
        XFREE(MTYPE_PIM_INTERFACE, pim_ifp);
+ #endif
  
        ifp->info = NULL;
  }

diff --cc pimd/pim_ifchannel.c
Simple merge

diff --cc pimd/pim_mroute.c
index cf9127bc91aa018e60766bd1bd668fb026c95408,26ca0e2ceedf36011401c7ffffc31f7373e3f28d..af6f59824ccab7b9f8ca96fc6b9855639c3e044c
--- 1/pimd/pim_mroute.c
--- 2/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@@ -676,8 -679,16 +679,16 @@@ static int pim_mroute_msg(struct pim_in
  
        return 0;
  }
+ #else /* PIM_IPV != 4 */
+ 
+ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
+                         int buf_size, ifindex_t ifindex)
+ {
+       return 0;
+ }
+ #endif /* PIM_IPV != 4 */
  
 -static int mroute_read(struct thread *t)
 +static void mroute_read(struct thread *t)
  {
        struct pim_instance *pim;
        static long long count;

diff --cc pimd/pim_nb_config.c
Simple merge

diff --cc pimd/pim_nht.c
Simple merge

diff --cc pimd/pim_upstream.c
Simple merge

diff --cc pimd/pim_zebra.c
Simple merge

diff --cc pimd/pim_zlookup.c
Simple merge