Merge pull request FRRouting#20552 from donaldsharp/separate_sg_rpt_sg_ifchannels

Separate sg rpt sg ifchannels and add ability to set a override-interval and a test.

Author: Jafaral

doc/user/pim.rst

@@ -422,6 +422,11 @@ keyword at the end.
    Modify the PIM assert override interval in milliseconds on this
    interface (defaults to 3000).
 
+.. clicmd:: ip pim override-interval (0-65535)
+
+   Modify the PIM LAN prune delay override interval in milliseconds on this
+   interface (defaults to 2500).
+
 .. clicmd:: ip pim [sm | dm | sm-dm]
 
    Enable PIM on this interface. PIM will use this interface to form PIM

doc/user/pimv6.rst

@@ -169,6 +169,11 @@ PIMv6 Router
    Modify the PIM assert override interval in milliseconds on this
    interface (defaults to 3000).
 
+.. clicmd:: ipv6 pim override-interval (0-65535)
+
+   Modify the PIM LAN prune delay override interval in milliseconds on this
+   interface (defaults to 2500).
+
 .. clicmd:: keep-alive-timer (1-65535)
    :daemon: pimv6
 

gdb/pim.txt

@@ -228,6 +228,137 @@ Example usage:
 To also dump the JP aggregation details, use dump_neighbor_jp_agg.
 end
 
+define dump_pim_neighbor
+  set $_neigh = (struct pim_neighbor *)$arg0
+  
+  if $_neigh == 0
+    printf "Neighbor pointer is NULL\n"
+  else
+    printf "========== PIM Neighbor %p ==========\n", $_neigh
+    
+    # Source address
+    printf "Source Address: "
+    if sizeof($_neigh->source_addr) == 4
+      # IPv4
+      set $_na = (unsigned char *)&$_neigh->source_addr
+      printf "%u.%u.%u.%u", $_na[0], $_na[1], $_na[2], $_na[3]
+    else
+      # IPv6
+      dump_s6_addr &$_neigh->source_addr
+    end
+    printf "\n"
+    
+    # Interface
+    if $_neigh->interface != 0
+      printf "Interface:      %s\n", $_neigh->interface->name
+    else
+      printf "Interface:      NULL\n"
+    end
+    
+    # Creation timestamp
+    printf "Creation time:  %ld\n", $_neigh->creation
+    
+    # Hello options (bit flags)
+    printf "Hello options:  0x%08x ", $_neigh->hello_options
+    if $_neigh->hello_options & 0x1
+      printf "HOLDTIME "
+    end
+    if $_neigh->hello_options & 0x2
+      printf "LAN_PRUNE_DELAY "
+    end
+    if $_neigh->hello_options & 0x4
+      printf "DR_PRIORITY "
+    end
+    if $_neigh->hello_options & 0x8
+      printf "GENERATION_ID "
+    end
+    if $_neigh->hello_options & 0x10
+      printf "ADDRESS_LIST "
+    end
+    printf "\n"
+    
+    # Timers and parameters
+    printf "Holdtime:       %u sec\n", $_neigh->holdtime
+    printf "Propagation delay: %u msec\n", $_neigh->propagation_delay_msec
+    printf "Override interval: %u msec\n", $_neigh->override_interval_msec
+    printf "DR priority:    %u\n", $_neigh->dr_priority
+    printf "Generation ID:  0x%08x\n", $_neigh->generation_id
+    
+    # Prefix list (secondary addresses)
+    if $_neigh->prefix_list != 0
+      printf "Secondary addresses: count=%u\n", $_neigh->prefix_list->count
+      if $_neigh->prefix_list->count > 0
+        set $_pnode = $_neigh->prefix_list->head
+        set $_pcount = 0
+        while $_pnode != 0 && $_pcount < 10
+          set $_prefix = (struct prefix *)$_pnode->data
+          printf "  [%u] family=%u prefixlen=%u\n", $_pcount, $_prefix->family, $_prefix->prefixlen
+          set $_pnode = $_pnode->next
+          set $_pcount = $_pcount + 1
+        end
+        if $_neigh->prefix_list->count > 10
+          printf "  ... (%u more)\n", $_neigh->prefix_list->count - 10
+        end
+      end
+    else
+      printf "Secondary addresses: NULL\n"
+    end
+    
+    # Timers
+    printf "\nTimers:\n"
+    if $_neigh->t_expire_timer != 0
+      printf "  Expire timer: RUNNING (expires at %ld.%06ld)\n", $_neigh->t_expire_timer->u.sands.tv_sec, $_neigh->t_expire_timer->u.sands.tv_usec
+    else
+      printf "  Expire timer: stopped\n"
+    end
+    if $_neigh->jp_timer != 0
+      printf "  JP timer:     RUNNING (expires at %ld.%06ld)\n", $_neigh->jp_timer->u.sands.tv_sec, $_neigh->jp_timer->u.sands.tv_usec
+    else
+      printf "  JP timer:     stopped\n"
+    end
+    
+    # JP Aggregation list
+    if $_neigh->upstream_jp_agg != 0
+      printf "\nJP Aggregation: count=%u\n", $_neigh->upstream_jp_agg->count
+    else
+      printf "\nJP Aggregation: NULL\n"
+    end
+    
+    # BFD session
+    if $_neigh->bfd_session != 0
+      printf "BFD session:    %p (configured)\n", $_neigh->bfd_session
+    else
+      printf "BFD session:    NULL\n"
+    end
+    
+    printf "========================================\n"
+  end
+end
+document dump_pim_neighbor
+Dump detailed information about a PIM neighbor structure.
+
+This displays comprehensive information including:
+- Source address and interface
+- Creation timestamp
+- Hello options (decoded bit flags)
+- Holdtime, propagation delay, override interval
+- DR priority and generation ID
+- Secondary address list
+- Timer states
+- JP aggregation list count
+- BFD session status
+
+Arguments:
+  (struct pim_neighbor *) pointer to the neighbor structure
+
+Example usage:
+  (gdb) dump_pim_neighbor neigh
+  (gdb) p pim_ifp->pim_neighbor_list->head->data
+  (gdb) dump_pim_neighbor $
+  
+To also dump the JP aggregation details, use dump_neighbor_jp_agg.
+end
+
 define dump_neighbor_jp_agg
   set $_neigh = (struct pim_neighbor *)$arg0
 

pimd/pim6_cmd.c

@@ -226,6 +226,23 @@ DEFPY_YANG(if_ipv6_pim_assert_override_interval,
 	return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, FRR_PIM_AF_XPATH_VAL);
 }
 
+DEFPY_YANG(if_ipv6_pim_override_interval,
+           if_ipv6_pim_override_interval_cmd,
+           "[no] ipv6 pim override-interval ![(0-65535)$oi]",
+           NO_STR
+           IPV6_STR
+           PIM_STR
+           "LAN prune delay override interval\n"
+           "Milliseconds, default 2500\n")
+{
+	if (no)
+		nb_cli_enqueue_change(vty, "./override-interval", NB_OP_DESTROY, NULL);
+	else
+		nb_cli_enqueue_change(vty, "./override-interval", NB_OP_MODIFY, oi_str);
+
+	return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, FRR_PIM_AF_XPATH_VAL);
+}
+
 DEFPY (pim6_spt_switchover_infinity,
        pim6_spt_switchover_infinity_cmd,
        "spt-switchover infinity-and-beyond",
@@ -3156,6 +3173,7 @@ void pim_cmd_init(void)
 	install_element(INTERFACE_NODE, &no_interface_ipv6_mld_limits_cmd);
 	install_element(INTERFACE_NODE, &if_ipv6_pim_assert_interval_cmd);
 	install_element(INTERFACE_NODE, &if_ipv6_pim_assert_override_interval_cmd);
+	install_element(INTERFACE_NODE, &if_ipv6_pim_override_interval_cmd);
 
 	install_element(INTERFACE_NODE, &interface_ipv6_pim_use_source_cmd);
 

pimd/pim_cmd.c

@@ -6133,6 +6133,23 @@ DEFPY_YANG(interface_ip_pim_assert_override, interface_ip_pim_assert_override_cm
 	return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, FRR_PIM_AF_XPATH_VAL);
 }
 
+DEFPY_YANG(interface_ip_pim_override_interval,
+           interface_ip_pim_override_interval_cmd,
+           "[no] ip pim override-interval ![(0-65535)$oi]",
+           NO_STR
+           IP_STR
+           "pim multicast routing\n"
+           "LAN prune delay override interval\n"
+           "Milliseconds, default 2500\n")
+{
+	if (no)
+		nb_cli_enqueue_change(vty, "./override-interval", NB_OP_DESTROY, NULL);
+	else
+		nb_cli_enqueue_change(vty, "./override-interval", NB_OP_MODIFY, oi_str);
+
+	return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, FRR_PIM_AF_XPATH_VAL);
+}
+
 DEFUN (debug_igmp,
        debug_igmp_cmd,
        "debug igmp",
@@ -9480,6 +9497,7 @@ void pim_cmd_init(void)
 	install_element(INTERFACE_NODE, &interface_no_ip_pim_neighbor_prefix_list_cmd);
 	install_element(INTERFACE_NODE, &interface_ip_pim_assert_interval_cmd);
 	install_element(INTERFACE_NODE, &interface_ip_pim_assert_override_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_pim_override_interval_cmd);
 
 	// Static mroutes NEB
 	install_element(INTERFACE_NODE, &interface_ip_mroute_cmd);

pimd/pim_cmd_common.c

@@ -1766,10 +1766,9 @@ static void pim_show_join_helper(struct pim_interface *pim_ifp,
 		json_object_string_add(json_row, "upTime", uptime);
 		json_object_string_add(json_row, "expire", expire);
 		json_object_string_add(json_row, "prune", prune);
-		json_object_string_add(
-			json_row, "channelJoinName",
-			pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags));
-		if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
+		json_object_string_add(json_row, "channelJoinName",
+				       pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->sg_rpt));
+		if (pim_ifchannel_is_sg_rpt(ch))
 			json_object_int_add(json_row, "sgRpt", 1);
 		if (PIM_IF_FLAG_TEST_PROTO_PIM(ch->flags))
 			json_object_int_add(json_row, "protocolPim", 1);
@@ -1780,19 +1779,29 @@ static void pim_show_join_helper(struct pim_interface *pim_ifp,
 		json_object_object_get_ex(json_iface, ch_grp_str, &json_grp);
 		if (!json_grp) {
 			json_grp = json_object_new_object();
-			json_object_object_addf(json_grp, json_row, "%pPAs",
-						&ch->sg.src);
 			json_object_object_addf(json_iface, json_grp, "%pPAs",
 						&ch->sg.grp);
-		} else
-			json_object_object_addf(json_grp, json_row, "%pPAs",
-						&ch->sg.src);
+		}
+
+		/* Generate a unique key for this channel entry.
+		 * If this is an (S,G,rpt) channel and a regular (S,G) already exists,
+		 * append ",S,Grpt" suffix to distinguish them.
+		 */
+		char src_key[PIM_ADDRSTRLEN + 16];
+
+		if (pim_ifchannel_is_sg_rpt(ch)) {
+			/* For S,G,rpt entries, append ",S,Grpt" suffix */
+			snprintfrr(src_key, sizeof(src_key), "%pPAs,S,Grpt", &ch->sg.src);
+		} else {
+			snprintfrr(src_key, sizeof(src_key), "%pPAs", &ch->sg.src);
+		}
+
+		json_object_object_add(json_grp, src_key, json_row);
 	} else {
-		ttable_add_row(
-			tt, "%s|%pPAs|%pPAs|%pPAs|%s|%s|%s|%s",
-			ch->interface->name, &ifaddr, &ch->sg.src, &ch->sg.grp,
-			pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags),
-			uptime, expire, prune);
+		ttable_add_row(tt, "%s|%pPAs|%pPAs|%pPAs|%s|%s|%s|%s", ch->interface->name,
+			       &ifaddr, &ch->sg.src, &ch->sg.grp,
+			       pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->sg_rpt), uptime,
+			       expire, prune);
 	}
 }
 

pimd/pim_dm.c

@@ -236,7 +236,7 @@ void pim_dm_recv_graft(struct interface *ifp, pim_sgaddr *sg)
 	struct pim_upstream *up;
 	struct pim_interface *pim_ifp = ifp->info;
 	pim_addr group_addr = sg->grp;
-	struct pim_ifchannel *ch;
+	struct pim_ifchannel *ch, *throwaway;
 
 	if (!pim_ifp || !pim_ifp->pim_enable)
 		return;
@@ -256,7 +256,7 @@ void pim_dm_recv_graft(struct interface *ifp, pim_sgaddr *sg)
 		oil_if_set(up->channel_oil, pim_ifp->mroute_vif_index, 1);
 		pim_upstream_mroute_update(up->channel_oil, __func__);
 
-		ch = pim_ifchannel_find(ifp, sg);
+		pim_ifchannel_find(ifp, sg, &ch, &throwaway);
 
 		if (ch) {
 			PIM_UPSTREAM_DM_UNSET_PRUNE(ch->flags);
@@ -283,7 +283,7 @@ void pim_dm_recv_prune(struct interface *ifp, struct pim_neighbor *neigh, uint16
 	struct pim_upstream *up;
 	struct pim_interface *pim_ifp;
 	pim_addr group_addr = sg->grp;
-	struct pim_ifchannel *ch;
+	struct pim_ifchannel *ch, *throwaway;
 
 	struct interface *ifp2 = NULL;
 	struct pim_interface *pim_ifp2;
@@ -332,7 +332,7 @@ void pim_dm_recv_prune(struct interface *ifp, struct pim_neighbor *neigh, uint16
 			prune_timer_start(up);
 		}
 
-		ch = pim_ifchannel_find(ifp, sg);
+		pim_ifchannel_find(ifp, sg, &ch, &throwaway);
 		if (!ch)
 			ch = pim_ifchannel_add(ifp, sg, source_flags,
 					       PIM_UPSTREAM_DM_FLAG_MASK_PRUNE);