diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 09:45:57 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 09:45:57 -0400 |
| commit | ac139b5fb6f0a9f14ced54b9b7dcee9d2e98558e (patch) | |
| tree | 049c46521cea65946eb15b198f5ea0da9c015212 /pimd/pim_cmd.c | |
| parent | 25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b (diff) | |
| parent | 69b174d4ec7d347054761d4ddcddba096c9c4ece (diff) | |
Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
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 da07dcb4ac..c1bce0a222 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) |