pimd: fix missing igmp mtrace length check

[mirror_frr.git] / pimd / pim_vty.c

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 2654ebc588b6b93a1397a7e4755bc8a6cb2ce42d..c48ec373f844c526f049a22dc9f9c77b5339bc96 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -39,6 +39,7 @@
 #include "pim_msdp.h"
 #include "pim_ssm.h"
 #include "pim_bfd.h"
+#include "pim_bsm.h"
 #include "pim_vxlan.h"
 
 int pim_debug_config_write(struct vty *vty)
@@ -69,10 +70,6 @@ int pim_debug_config_write(struct vty *vty)
                vty_out(vty, "debug igmp trace\n");
                ++writes;
        }
-       if (PIM_DEBUG_IGMP_TRACE_DETAIL) {
-               vty_out(vty, "debug igmp trace detail\n");
-               ++writes;
-       }
 
        if (PIM_DEBUG_MROUTE) {
                vty_out(vty, "debug mroute\n");
@@ -84,7 +81,7 @@ int pim_debug_config_write(struct vty *vty)
                ++writes;
        }
 
-       if (PIM_DEBUG_MROUTE_DETAIL) {
+       if (PIM_DEBUG_MROUTE_DETAIL_ONLY) {
                vty_out(vty, "debug mroute detail\n");
                ++writes;
        }
@@ -110,7 +107,7 @@ int pim_debug_config_write(struct vty *vty)
                vty_out(vty, "debug pim trace\n");
                ++writes;
        }
-       if (PIM_DEBUG_PIM_TRACE_DETAIL) {
+       if (PIM_DEBUG_PIM_TRACE_DETAIL_ONLY) {
                vty_out(vty, "debug pim trace detail\n");
                ++writes;
        }
@@ -120,6 +117,11 @@ int pim_debug_config_write(struct vty *vty)
                ++writes;
        }
 
+       if (PIM_DEBUG_BSM) {
+               vty_out(vty, "debug pim bsm\n");
+               ++writes;
+       }
+
        if (PIM_DEBUG_VXLAN) {
                vty_out(vty, "debug pim vxlan\n");
                ++writes;
@@ -344,6 +346,24 @@ int pim_interface_config_write(struct vty *vty)
                                        ++writes;
                                }
 
+                               /* IF ip igmp last-member_query-count */
+                               if (pim_ifp->igmp_last_member_query_count
+                                   != IGMP_DEFAULT_ROBUSTNESS_VARIABLE) {
+                                       vty_out(vty,
+                                               " ip igmp last-member-query-count %d\n",
+                                               pim_ifp->igmp_last_member_query_count);
+                                       ++writes;
+                               }
+
+                               /* IF ip igmp last-member_query-interval */
+                               if (pim_ifp->igmp_specific_query_max_response_time_dsec
+                                   != IGMP_SPECIFIC_QUERY_MAX_RESPONSE_TIME_DSEC) {
+                                       vty_out(vty,
+                                               " ip igmp last-member-query-interval %d\n",
+                                               pim_ifp->igmp_specific_query_max_response_time_dsec);
+                                         ++writes;
+                               }
+
                                /* IF ip igmp join */
                                if (pim_ifp->igmp_join_list) {
                                        struct listnode *node;
@@ -359,13 +379,19 @@ int pim_interface_config_write(struct vty *vty)
                                                        ij->group_addr,
                                                        group_str,
                                                        sizeof(group_str));
-                                               inet_ntop(AF_INET,
-                                                         &ij->source_addr,
-                                                         source_str,
-                                                         sizeof(source_str));
-                                               vty_out(vty,
-                                                       " ip igmp join %s %s\n",
-                                                       group_str, source_str);
+                                               if (ij->source_addr.s_addr == INADDR_ANY) {
+                                                       vty_out(vty,
+                                                               " ip igmp join %s\n",
+                                                               group_str);
+                                               } else {
+                                                       inet_ntop(AF_INET,
+                                                                 &ij->source_addr,
+                                                                 source_str,
+                                                                 sizeof(source_str));
+                                                       vty_out(vty,
+                                                               " ip igmp join %s %s\n",
+                                                               group_str, source_str);
+                                               }
                                                ++writes;
                                        }
                                }
@@ -383,7 +409,10 @@ int pim_interface_config_write(struct vty *vty)
 
                                writes +=
                                        pim_static_write_mroute(pim, vty, ifp);
+                               pim_bsm_write_config(vty, ifp);
+                               ++writes;
                                pim_bfd_write_config(vty, ifp);
+                               ++writes;
                        }
                        vty_endframe(vty, "!\n");
                        ++writes;