summaryrefslogtreecommitdiffstats
path: root/pimd/pim_vty.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-08-02 16:35:14 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-08-02 16:38:48 +0200
commitc55f7a8003faab390c2b02eecbadf632f748122e (patch)
tree18d02639ff37625138fe94e38acac9c6ba09a7de /pimd/pim_vty.c
parentMerge pull request #2760 from donaldsharp/bgp_patch_from_dev (diff)
downloadfrr-c55f7a8003faab390c2b02eecbadf632f748122e.tar.xz
frr-c55f7a8003faab390c2b02eecbadf632f748122e.zip
pimd: Modify order of command output for vty output
If `ip igmp query-max-response-time` is set move it to display first as that this command has order dependencies on `ip igmp query-interval`. Ticket: CM-21598 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_vty.c')
-rw-r--r--pimd/pim_vty.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 862b2cc14..f4d833c26 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -313,15 +313,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 +322,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;