diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
| commit | 57463530f3f8b687f238bc76020c0f168b19f0a8 (patch) | |
| tree | 820493847a8e55e5ceaa0742e996ae55bd49b7e0 /pimd/pim_cmd.c | |
| parent | Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels") (diff) | |
| parent | Merge branch 'frr/pull/575' (diff) | |
| download | frr-57463530f3f8b687f238bc76020c0f168b19f0a8.tar.xz frr-57463530f3f8b687f238bc76020c0f168b19f0a8.zip | |
Merge branch 'stable/3.0'
Conflicts:
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/interface.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index da07dcb4a..c1bce0a22 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -5320,11 +5320,16 @@ DEFUN (interface_ip_pim_hello, pim_ifp = ifp->info; - if (!pim_ifp) { - vty_out(vty, "Pim not enabled on this interface%s", VTY_NEWLINE); - return CMD_WARNING; - } + if (!pim_ifp) + { + if (!pim_cmd_interface_add(ifp)) + { + vty_out(vty, "Could not enable PIM SM on interface%s", VTY_NEWLINE); + return CMD_WARNING; + } + } + pim_ifp = ifp->info; pim_ifp->pim_hello_period = strtol(argv[idx_time]->arg, NULL, 10); if (argc == idx_hold + 1) |