pimd: Add IGMP join sent/failed statistics

```
exit1-debian-11# sh ip igmp statistics
IGMP statistics
Interface           : global
V1 query            : 0
V2 query            : 0
V3 query            : 0
V2 leave            : 0
V1 report           : 0
V2 report           : 0
V3 report           : 16
mtrace response     : 0
mtrace request      : 0
unsupported         : 0
joins failed        : 0
joins sent          : 11
total groups        : 4
total source groups : 0
exit1-debian-11# sh ip igmp statistics json
{
  "global":{
    "name":"global",
    "queryV1":0,
    "queryV2":0,
    "queryV3":0,
    "leaveV3":0,
    "reportV1":0,
    "reportV2":0,
    "reportV3":16,
    "mtraceResponse":0,
    "mtraceRequest":0,
    "unsupported":0,
    "totalGroups":4,
    "totalSourceGroups":0,
    "joinsFailed":0,
    "joinsSent":11
  }
}
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

1 files changed, 48 insertions, 31 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 8906caf00f..bf803a4836 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1284,9 +1284,9 @@ static void igmp_show_statistics(struct pim_instance *pim, struct vty *vty,
 				 const char *ifname, bool uj)
 {
 	struct interface *ifp;
-	struct igmp_stats rx_stats;
+	struct igmp_stats igmp_stats;
 
-	igmp_stats_init(&rx_stats);
+	igmp_stats_init(&igmp_stats);
 
 	FOR_ALL_INTERFACES (pim->vrf, ifp) {
 		struct pim_interface *pim_ifp;
@@ -1303,7 +1303,9 @@ static void igmp_show_statistics(struct pim_instance *pim, struct vty *vty,
 		if (ifname && strcmp(ifname, ifp->name))
 			continue;
 
-		rx_stats.total_groups +=
+		igmp_stats.joins_failed += pim_ifp->igmp_ifstat_joins_failed;
+		igmp_stats.joins_sent += pim_ifp->igmp_ifstat_joins_sent;
+		igmp_stats.total_groups +=
 			pim_ifp->gm_group_list
 				? listcount(pim_ifp->gm_group_list)
 				: 0;
@@ -1315,13 +1317,13 @@ static void igmp_show_statistics(struct pim_instance *pim, struct vty *vty,
 				if (pim_addr_is_any(src->source_addr))
 					continue;
 
-				rx_stats.total_source_groups++;
+				igmp_stats.total_source_groups++;
 			}
 		}
 
 		for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_socket_list, sock_node,
 					  igmp)) {
-			igmp_stats_add(&rx_stats, &igmp->rx_stats);
+			igmp_stats_add(&igmp_stats, &igmp->igmp_stats);
 		}
 	}
 	if (uj) {
@@ -1333,45 +1335,58 @@ static void igmp_show_statistics(struct pim_instance *pim, struct vty *vty,
 
 		json_object_string_add(json_row, "name", ifname ? ifname :
 				       "global");
-		json_object_int_add(json_row, "queryV1", rx_stats.query_v1);
-		json_object_int_add(json_row, "queryV2", rx_stats.query_v2);
-		json_object_int_add(json_row, "queryV3", rx_stats.query_v3);
-		json_object_int_add(json_row, "leaveV2", rx_stats.leave_v2);
-		json_object_int_add(json_row, "reportV1", rx_stats.report_v1);
-		json_object_int_add(json_row, "reportV2", rx_stats.report_v2);
-		json_object_int_add(json_row, "reportV3", rx_stats.report_v3);
+		json_object_int_add(json_row, "queryV1", igmp_stats.query_v1);
+		json_object_int_add(json_row, "queryV2", igmp_stats.query_v2);
+		json_object_int_add(json_row, "queryV3", igmp_stats.query_v3);
+		json_object_int_add(json_row, "leaveV2", igmp_stats.leave_v2);
+		json_object_int_add(json_row, "reportV1", igmp_stats.report_v1);
+		json_object_int_add(json_row, "reportV2", igmp_stats.report_v2);
+		json_object_int_add(json_row, "reportV3", igmp_stats.report_v3);
 		json_object_int_add(json_row, "mtraceResponse",
-				    rx_stats.mtrace_rsp);
+				    igmp_stats.mtrace_rsp);
 		json_object_int_add(json_row, "mtraceRequest",
-				    rx_stats.mtrace_req);
+				    igmp_stats.mtrace_req);
 		json_object_int_add(json_row, "unsupported",
-				    rx_stats.unsupported);
+				    igmp_stats.unsupported);
 		json_object_int_add(json_row, "totalGroups",
-				    rx_stats.total_groups);
+				    igmp_stats.total_groups);
 		json_object_int_add(json_row, "totalSourceGroups",
-				    rx_stats.total_source_groups);
+				    igmp_stats.total_source_groups);
+		json_object_int_add(json_row, "joinsFailed",
+				    igmp_stats.joins_failed);
+		json_object_int_add(json_row, "joinsSent",
+				    igmp_stats.joins_sent);
 		json_object_object_add(json, ifname ? ifname : "global",
 				       json_row);
 		vty_json(vty, json);
 	} else {
-		vty_out(vty, "IGMP RX statistics\n");
-		vty_out(vty, "Interface       : %s\n",
+		vty_out(vty, "IGMP statistics\n");
+		vty_out(vty, "Interface           : %s\n",
 			ifname ? ifname : "global");
-		vty_out(vty, "V1 query            : %u\n", rx_stats.query_v1);
-		vty_out(vty, "V2 query            : %u\n", rx_stats.query_v2);
-		vty_out(vty, "V3 query            : %u\n", rx_stats.query_v3);
-		vty_out(vty, "V2 leave            : %u\n", rx_stats.leave_v2);
-		vty_out(vty, "V1 report           : %u\n", rx_stats.report_v1);
-		vty_out(vty, "V2 report           : %u\n", rx_stats.report_v2);
-		vty_out(vty, "V3 report           : %u\n", rx_stats.report_v3);
-		vty_out(vty, "mtrace response     : %u\n", rx_stats.mtrace_rsp);
-		vty_out(vty, "mtrace request      : %u\n", rx_stats.mtrace_req);
+		vty_out(vty, "V1 query            : %u\n", igmp_stats.query_v1);
+		vty_out(vty, "V2 query            : %u\n", igmp_stats.query_v2);
+		vty_out(vty, "V3 query            : %u\n", igmp_stats.query_v3);
+		vty_out(vty, "V2 leave            : %u\n", igmp_stats.leave_v2);
+		vty_out(vty, "V1 report           : %u\n",
+			igmp_stats.report_v1);
+		vty_out(vty, "V2 report           : %u\n",
+			igmp_stats.report_v2);
+		vty_out(vty, "V3 report           : %u\n",
+			igmp_stats.report_v3);
+		vty_out(vty, "mtrace response     : %u\n",
+			igmp_stats.mtrace_rsp);
+		vty_out(vty, "mtrace request      : %u\n",
+			igmp_stats.mtrace_req);
 		vty_out(vty, "unsupported         : %u\n",
-			rx_stats.unsupported);
+			igmp_stats.unsupported);
+		vty_out(vty, "joins failed        : %u\n",
+			igmp_stats.joins_failed);
+		vty_out(vty, "joins sent          : %u\n",
+			igmp_stats.joins_sent);
 		vty_out(vty, "total groups        : %u\n",
-			rx_stats.total_groups);
+			igmp_stats.total_groups);
 		vty_out(vty, "total source groups : %u\n",
-			rx_stats.total_source_groups);
+			igmp_stats.total_source_groups);
 	}
 }
 
@@ -3995,6 +4010,8 @@ DEFUN (clear_ip_pim_interface_traffic,
 		pim_ifp->pim_ifstat_assert_send = 0;
 		pim_ifp->pim_ifstat_bsm_rx = 0;
 		pim_ifp->pim_ifstat_bsm_tx = 0;
+		pim_ifp->igmp_ifstat_joins_sent = 0;
+		pim_ifp->igmp_ifstat_joins_failed = 0;
 	}
 
 	return CMD_SUCCESS;