lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pim_vty.c

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 688bc42c3dddf3c8682bf4e7b6c8920bba00278b..a4aec710e9a6cb2e461c741bc7e0504ea96cf41d 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -214,10 +214,10 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
                                spaces);
                ++writes;
        }
-       if (qpim_ecmp_rebalance_enable) {
+       if (pim->ecmp_rebalance_enable) {
                vty_out(vty, "%sip pim ecmp rebalance\n", spaces);
                ++writes;
-       } else if (qpim_ecmp_enable) {
+       } else if (pim->ecmp_enable) {
                vty_out(vty, "%sip pim ecmp\n", spaces);
                ++writes;
        }
@@ -258,11 +258,16 @@ int pim_interface_config_write(struct vty *vty)
                                          ifp->name, vrf->name);
                        ++writes;
 
+                       if (ifp->desc) {
+                               vty_out(vty, " description %s\n", ifp->desc);
+                               ++writes;
+                       }
+
                        if (ifp->info) {
                                struct pim_interface *pim_ifp = ifp->info;
 
                                if (PIM_IF_TEST_PIM(pim_ifp->options)) {
-                                       vty_out(vty, " ip pim sm\n");
+                                       vty_out(vty, " ip pim\n");
                                        ++writes;
                                }
 
@@ -313,15 +318,6 @@ int pim_interface_config_write(struct vty *vty)
                                        ++writes;
                                }
 
-                               /* IF ip igmp query-interval */
-                               if (pim_ifp->igmp_default_query_interval
-                                   != IGMP_GENERAL_QUERY_INTERVAL) {
-                                       vty_out(vty,
-                                               " ip igmp query-interval %d\n",
-                                               pim_ifp->igmp_default_query_interval);
-                                       ++writes;
-                               }
-
                                /* IF ip igmp query-max-response-time */
                                if (pim_ifp->igmp_query_max_response_time_dsec
                                    != IGMP_QUERY_MAX_RESPONSE_TIME_DSEC) {
@@ -331,6 +327,15 @@ int pim_interface_config_write(struct vty *vty)
                                        ++writes;
                                }
 
+                               /* IF ip igmp query-interval */
+                               if (pim_ifp->igmp_default_query_interval
+                                   != IGMP_GENERAL_QUERY_INTERVAL) {
+                                       vty_out(vty,
+                                               " ip igmp query-interval %d\n",
+                                               pim_ifp->igmp_default_query_interval);
+                                       ++writes;
+                               }
+
                                /* IF ip igmp join */
                                if (pim_ifp->igmp_join_list) {
                                        struct listnode *node;