proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vrrpd: change all user facing times to ms

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-03-20 04:50:22 +00:00
parent d5dc62c40b
commit cb44d47667
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vrrpd/vrrp.c
View File

@ -2229,8 +2229,8 @@ int vrrp_config_write_interface(struct vty *vty)
&& ++writes) && ++writes)
vty_out(vty, vty_out(vty,
" vrrp %" PRIu8 " vrrp %" PRIu8
" advertisement-interval %" PRIu16 "\n", " advertisement-interval %d\n",
vr->vrid, vr->advertisement_interval); vr->vrid, vr->advertisement_interval * CS2MS);
if (vr->priority != vd.priority && ++writes) if (vr->priority != vd.priority && ++writes)
vty_out(vty, " vrrp %" PRIu8 " priority %" PRIu8 "\n", vty_out(vty, " vrrp %" PRIu8 " priority %" PRIu8 "\n",

3
vrrpd/vrrp.h
View File

@ -51,6 +51,9 @@
#define VRRP_DEFAULT_ACCEPT true #define VRRP_DEFAULT_ACCEPT true
#define VRRP_DEFAULT_SHUTDOWN false #define VRRP_DEFAULT_SHUTDOWN false
/* User compatibility constant */
#define CS2MS 10
/* Configured defaults */ /* Configured defaults */
struct vrrp_defaults { struct vrrp_defaults {
uint8_t priority; uint8_t priority;

52
vrrpd/vrrp_vty.c
View File

@ -137,9 +137,9 @@ DEFPY(vrrp_priority,
DEFPY(vrrp_advertisement_interval, DEFPY(vrrp_advertisement_interval,
vrrp_advertisement_interval_cmd, vrrp_advertisement_interval_cmd,
"[no] vrrp (1-255)$vrid advertisement-interval (1-4096)", "[no] vrrp (1-255)$vrid advertisement-interval (10-40950)",
NO_STR VRRP_STR VRRP_VRID_STR VRRP_ADVINT_STR NO_STR VRRP_STR VRRP_VRID_STR VRRP_ADVINT_STR
"Advertisement interval in centiseconds") "Advertisement interval in milliseconds; must be multiple of 10")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
@ -147,6 +147,14 @@ DEFPY(vrrp_advertisement_interval,
uint16_t newadvint = no ? vd.advertisement_interval : uint16_t newadvint = no ? vd.advertisement_interval :
advertisement_interval; advertisement_interval;
if (newadvint % 10 != 0) {
vty_out(vty, "%% Value must be a multiple of 10\n");
return CMD_WARNING_CONFIG_FAILED;
}
/* all internal computations are in centiseconds */
newadvint /= CS2MS;
VROUTER_GET_VTY(vty, ifp, vrid, vr); VROUTER_GET_VTY(vty, ifp, vrid, vr);
vrrp_set_advertisement_interval(vr, newadvint); vrrp_set_advertisement_interval(vr, newadvint);
@ -377,10 +385,10 @@ static struct json_object *vrrp_build_json(struct vrrp_vrouter *vr)
json_object_string_add(v4, "status", stastr4); json_object_string_add(v4, "status", stastr4);
json_object_int_add(v4, "effectivePriority", vr->v4->priority); json_object_int_add(v4, "effectivePriority", vr->v4->priority);
json_object_int_add(v4, "masterAdverInterval", json_object_int_add(v4, "masterAdverInterval",
vr->v4->master_adver_interval); vr->v4->master_adver_interval * CS2MS);
json_object_int_add(v4, "skewTime", vr->v4->skew_time); json_object_int_add(v4, "skewTime", vr->v4->skew_time * CS2MS);
json_object_int_add(v4, "masterDownInterval", json_object_int_add(v4, "masterDownInterval",
vr->v4->master_down_interval); vr->v4->master_down_interval * CS2MS);
/* v4 stats */ /* v4 stats */
json_object_int_add(v4_stats, "adverTx", vr->v4->stats.adver_tx_cnt); json_object_int_add(v4_stats, "adverTx", vr->v4->stats.adver_tx_cnt);
json_object_int_add(v4_stats, "adverRx", vr->v4->stats.adver_rx_cnt); json_object_int_add(v4_stats, "adverRx", vr->v4->stats.adver_rx_cnt);
@ -410,10 +418,10 @@ static struct json_object *vrrp_build_json(struct vrrp_vrouter *vr)
json_object_string_add(v6, "status", stastr6); json_object_string_add(v6, "status", stastr6);
json_object_int_add(v6, "effectivePriority", vr->v6->priority); json_object_int_add(v6, "effectivePriority", vr->v6->priority);
json_object_int_add(v6, "masterAdverInterval", json_object_int_add(v6, "masterAdverInterval",
vr->v6->master_adver_interval); vr->v6->master_adver_interval * CS2MS);
json_object_int_add(v6, "skewTime", vr->v6->skew_time); json_object_int_add(v6, "skewTime", vr->v6->skew_time * CS2MS);
json_object_int_add(v6, "masterDownInterval", json_object_int_add(v6, "masterDownInterval",
vr->v6->master_down_interval); vr->v6->master_down_interval * CS2MS);
/* v6 stats */ /* v6 stats */
json_object_int_add(v6_stats, "adverTx", vr->v6->stats.adver_tx_cnt); json_object_int_add(v6_stats, "adverTx", vr->v6->stats.adver_tx_cnt);
json_object_int_add(v6_stats, "adverRx", vr->v6->stats.adver_rx_cnt); json_object_int_add(v6_stats, "adverRx", vr->v6->stats.adver_rx_cnt);
@ -490,14 +498,14 @@ static void vrrp_show(struct vty *vty, struct vrrp_vrouter *vr)
vr->preempt_mode ? "Yes" : "No"); vr->preempt_mode ? "Yes" : "No");
ttable_add_row(tt, "%s|%s", "Accept Mode", ttable_add_row(tt, "%s|%s", "Accept Mode",
vr->accept_mode ? "Yes" : "No"); vr->accept_mode ? "Yes" : "No");
ttable_add_row(tt, "%s|%" PRIu16 " cs", "Advertisement Interval", ttable_add_row(tt, "%s|%d ms", "Advertisement Interval",
vr->advertisement_interval); vr->advertisement_interval * CS2MS);
ttable_add_row(tt, "%s|%" PRIu16 " cs", ttable_add_row(tt, "%s|%d ms",
"Master Advertisement Interval (v4)", "Master Advertisement Interval (v4)",
vr->v4->master_adver_interval); vr->v4->master_adver_interval * CS2MS);
ttable_add_row(tt, "%s|%" PRIu16 " cs", ttable_add_row(tt, "%s|%d ms",
"Master Advertisement Interval (v6)", "Master Advertisement Interval (v6)",
vr->v6->master_adver_interval); vr->v6->master_adver_interval * CS2MS);
ttable_add_row(tt, "%s|%" PRIu32, "Advertisements Tx (v4)", ttable_add_row(tt, "%s|%" PRIu32, "Advertisements Tx (v4)",
vr->v4->stats.adver_tx_cnt); vr->v4->stats.adver_tx_cnt);
ttable_add_row(tt, "%s|%" PRIu32, "Advertisements Tx (v6)", ttable_add_row(tt, "%s|%" PRIu32, "Advertisements Tx (v6)",
@ -514,14 +522,14 @@ static void vrrp_show(struct vty *vty, struct vrrp_vrouter *vr)
vr->v4->stats.trans_cnt); vr->v4->stats.trans_cnt);
ttable_add_row(tt, "%s|%" PRIu32, "State transitions (v6)", ttable_add_row(tt, "%s|%" PRIu32, "State transitions (v6)",
vr->v6->stats.trans_cnt); vr->v6->stats.trans_cnt);
ttable_add_row(tt, "%s|%" PRIu16 " cs", "Skew Time (v4)", ttable_add_row(tt, "%s|%d ms", "Skew Time (v4)",
vr->v4->skew_time); vr->v4->skew_time * CS2MS);
ttable_add_row(tt, "%s|%" PRIu16 " cs", "Skew Time (v6)", ttable_add_row(tt, "%s|%d ms", "Skew Time (v6)",
vr->v6->skew_time); vr->v6->skew_time * CS2MS);
ttable_add_row(tt, "%s|%" PRIu16 " cs", "Master Down Interval (v4)", ttable_add_row(tt, "%s|%d ms", "Master Down Interval (v4)",
vr->v4->master_down_interval); vr->v4->master_down_interval * CS2MS);
ttable_add_row(tt, "%s|%" PRIu16 " cs", "Master Down Interval (v6)", ttable_add_row(tt, "%s|%d ms", "Master Down Interval (v6)",
vr->v6->master_down_interval); vr->v6->master_down_interval * CS2MS);
ttable_add_row(tt, "%s|%u", "IPv4 Addresses", vr->v4->addrs->count); ttable_add_row(tt, "%s|%u", "IPv4 Addresses", vr->v4->addrs->count);
char fill[35]; char fill[35];