mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-14 02:37:21 +00:00
Merge pull request #8983 from mobash-rasool/pim-upstreaming-activity
pimd: Minor fixes for BSM Show CLI and Hold Timer CLI
This commit is contained in:
commit
6afa0b137a
@ -199,7 +199,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end.
|
||||
Set the DR Priority for the interface. This command is useful to allow the
|
||||
user to influence what node becomes the DR for a lan segment.
|
||||
|
||||
.. clicmd:: ip pim hello (1-180) (1-180)
|
||||
.. clicmd:: ip pim hello (1-180) (1-630)
|
||||
|
||||
Set the pim hello and hold interval for a interface.
|
||||
|
||||
|
@ -1154,6 +1154,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 {
|
||||
@ -1308,6 +1314,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");
|
||||
}
|
||||
}
|
||||
|
||||
@ -8771,7 +8786,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
|
||||
@ -8806,7 +8821,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
|
||||
|
@ -1613,7 +1613,7 @@ int lib_interface_pim_hello_holdtime_modify(struct nb_cb_modify_args *args)
|
||||
ifp = nb_running_get_entry(args->dnode, NULL, true);
|
||||
pim_ifp = ifp->info;
|
||||
pim_ifp->pim_default_holdtime =
|
||||
yang_dnode_get_uint8(args->dnode, NULL);
|
||||
yang_dnode_get_uint16(args->dnode, NULL);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -350,8 +350,8 @@ pim_neighbor_new(struct interface *ifp, struct in_addr source_addr,
|
||||
__func__, src_str, ifp->name);
|
||||
}
|
||||
|
||||
zlog_info("PIM NEIGHBOR UP: neighbor %s on interface %s", src_str,
|
||||
ifp->name);
|
||||
zlog_notice("PIM NEIGHBOR UP: neighbor %s on interface %s", src_str,
|
||||
ifp->name);
|
||||
|
||||
if (neigh->propagation_delay_msec
|
||||
> pim_ifp->pim_neighbors_highest_propagation_delay_msec) {
|
||||
@ -616,8 +616,8 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
|
||||
assert(pim_ifp);
|
||||
|
||||
pim_inet4_dump("<src?>", neigh->source_addr, src_str, sizeof(src_str));
|
||||
zlog_info("PIM NEIGHBOR DOWN: neighbor %s on interface %s: %s", src_str,
|
||||
ifp->name, delete_message);
|
||||
zlog_notice("PIM NEIGHBOR DOWN: neighbor %s on interface %s: %s",
|
||||
src_str, ifp->name, delete_message);
|
||||
|
||||
THREAD_OFF(neigh->t_expire_timer);
|
||||
|
||||
|
@ -351,8 +351,8 @@ module frr-pim {
|
||||
}
|
||||
|
||||
leaf hello-holdtime {
|
||||
type uint8 {
|
||||
range "1..180";
|
||||
type uint16 {
|
||||
range "1..630";
|
||||
}
|
||||
must ". > ./../hello-interval" {
|
||||
error-message "HoldTime must be greater than Hello";
|
||||
|
Loading…
Reference in New Issue
Block a user