diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 17:52:56 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 17:52:56 +0000 |
| commit | 1161690b93b48fbd07f4ee25c1261574db8d71c5 (patch) | |
| tree | 7ffbe5c3b333b1fe0b8a3f042d8b1af602d48019 /pimd/pim_static.c | |
| parent | ab782c96f881b1fdd59f52ba972cd82b5eeadc66 (diff) | |
| parent | 5fca4e3635c2778e8349bce0eaf944c26913d321 (diff) | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'pimd/pim_static.c')
| -rw-r--r-- | pimd/pim_static.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pimd/pim_static.c b/pimd/pim_static.c index 63762ef327..a35bb60f46 100644 --- a/pimd/pim_static.c +++ b/pimd/pim_static.c @@ -337,9 +337,10 @@ pim_static_write_mroute (struct vty *vty, struct interface *ifp) { struct interface *oifp = pim_if_find_by_vif_index (i); if (sroute->source.s_addr == 0) - vty_out (vty, " ip mroute %s %s%s", oifp->name, gbuf, VTY_NEWLINE); + vty_outln (vty, " ip mroute %s %s", oifp->name, gbuf); else - vty_out (vty, " ip mroute %s %s %s%s", oifp->name, gbuf, sbuf, VTY_NEWLINE); + vty_outln (vty, " ip mroute %s %s %s", oifp->name, gbuf, + sbuf); count ++; } } |