]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Tighten up `show ip pim rp-info`
authorDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 18 Nov 2019 14:05:55 +0000 (09:05 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 18 Nov 2019 14:06:56 +0000 (09:06 -0500)
We were adding a newline for the source in some cases
but not others and tighten up the display of data

eva# show ip pim rp-info
RP address       group/prefix-list   OIF               I am RP    Source
10.254.0.1       224.0.0.0/4         lo                yes        Static
4.4.4.4          225.1.2.3/32        abcdefghijklmno   yes        Static
10.0.20.45       226.200.100.100/32  r1-eth0           no         Static
eva#

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_rp.c

index 3fa5760c5379ba0e924b3177a51d537253464bf2..85a4fcc1743ed3a065f2ce355da1091ae299157d 100644 (file)
@@ -1261,7 +1261,7 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
                json = json_object_new_object();
        else
                vty_out(vty,
-                       "RP address       group/prefix-list   OIF         I am RP     Source\n");
+                       "RP address       group/prefix-list   OIF               I am RP    Source\n");
        for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
                if (!pim_rpf_addr_is_inaddr_none(&rp_info->rp)) {
                        char buf[48];
@@ -1338,7 +1338,7 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
                                        vty_out(vty, "%-16s  ", "(Unknown)");
 
                                if (rp_info->i_am_rp)
-                                       vty_out(vty, "yes\n");
+                                       vty_out(vty, "yes");
                                else
                                        vty_out(vty, "no");