From: Donald Sharp <donaldsharp72@gmail.com>
Date: Sat, 26 Feb 2022 13:03:06 +0000 (-0500)
Subject: Merge pull request #10400 from opensourcerouting/pim6-compilefix
X-Git-Tag: pim6-testing-20220430~295
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3bf65aa1ae5fb69bf97c6dc54775a25c13cc4c59;p=matthieu%2Ffrr.git

Merge pull request #10400 from opensourcerouting/pim6-compilefix

pim6d: get running with ipv6 types throughout
---

3bf65aa1ae5fb69bf97c6dc54775a25c13cc4c59
diff --cc pimd/pim_cmd.c
index 83ba74f69f,bf65e943fc..3e3074827f
--- a/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 57fe97816e,3e24e69639..d6016d060b
--- a/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_mroute.c
index cf9127bc91,26ca0e2cee..af6f59824c
--- a/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;