diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2021-07-25 19:57:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 19:57:45 +0200 |
| commit | fe15d5ccdd2dd9549964ec834dc35af7b64fb647 (patch) | |
| tree | 318f980d219acbf903cc2ccfab7bcba73e16c0d6 /pimd/pim_cmd.c | |
| parent | 634ec2336232475dc5c92cbae0c3e7d7b12f8f1d (diff) | |
| parent | 762d40c21754bf17179d5080459465c92f0b6765 (diff) | |
Merge pull request #9175 from FRRouting/mergify/bp/stable/8.0/pr-8983
pimd: Minor fixes for BSM Show CLI and Hold Timer CLI (backport #8983)
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index f6072b1771..e6806bbbda 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -1135,6 +1135,12 @@ static void pim_show_interfaces_single(struct pim_instance *pim, json_object_int_add( json_row, "overrideIntervalHighest", pim_ifp->pim_neighbors_highest_override_interval_msec); + if (pim_ifp->bsm_enable) + json_object_boolean_true_add(json_row, + "bsmEnabled"); + if (pim_ifp->ucast_bsm_accept) + json_object_boolean_true_add(json_row, + "ucastBsmEnabled"); json_object_object_add(json, ifp->name, json_row); } else { @@ -1289,6 +1295,15 @@ static void pim_show_interfaces_single(struct pim_instance *pim, pim_ifp->pim_neighbors_highest_override_interval_msec); vty_out(vty, "\n"); vty_out(vty, "\n"); + + vty_out(vty, "BSM Status\n"); + vty_out(vty, "----------\n"); + vty_out(vty, "Bsm Enabled : %s\n", + pim_ifp->bsm_enable ? "yes" : "no"); + vty_out(vty, "Unicast Bsm Enabled : %s\n", + pim_ifp->ucast_bsm_accept ? "yes" : "no"); + vty_out(vty, "\n"); + vty_out(vty, "\n"); } } @@ -8705,7 +8720,7 @@ DEFUN (interface_no_ip_mroute, DEFUN (interface_ip_pim_hello, interface_ip_pim_hello_cmd, - "ip pim hello (1-180) [(1-180)]", + "ip pim hello (1-180) [(1-630)]", IP_STR PIM_STR IFACE_PIM_HELLO_STR @@ -8740,7 +8755,7 @@ DEFUN (interface_ip_pim_hello, DEFUN (interface_no_ip_pim_hello, interface_no_ip_pim_hello_cmd, - "no ip pim hello [(1-180) [(1-180)]]", + "no ip pim hello [(1-180) [(1-630)]]", NO_STR IP_STR PIM_STR |