diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 11:34:50 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 11:34:50 +0200 |
| commit | 303f85d5450ddc56250eff44a1e3d724c9e553fb (patch) | |
| tree | 5360edfee07198dd3055674647b2f4e4f203d433 /pimd/pim_cmd.c | |
| parent | f0913df9698a1cd948e9b2b0d35950a28ba4f916 (diff) | |
| parent | 95d3f5011b509acbbc3a257c74c23bc5b57148af (diff) | |
Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes")
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 d5dbe4f7ab..80decc34cd 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -5075,11 +5075,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) |