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

Merge pull request #10208 from adrianomarto/master

Browse Source 
Babel configuration parameter fixes
This commit is contained in:
Russ White 2022-01-05 10:10:23 -05:00 committed by GitHub
commit cd764511e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
babeld/babel_interface.c
View File

@ -484,7 +484,8 @@ DEFUN (babel_set_rtt_min,
babel_ifp = babel_get_if_nfo(ifp); babel_ifp = babel_get_if_nfo(ifp);
assert (babel_ifp != NULL); assert (babel_ifp != NULL);
babel_ifp->rtt_min = rtt; /* The value is entered in milliseconds but stored as microseconds. */
babel_ifp->rtt_min = rtt * 1000;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -504,7 +505,8 @@ DEFUN (babel_set_rtt_max,
babel_ifp = babel_get_if_nfo(ifp); babel_ifp = babel_get_if_nfo(ifp);
assert (babel_ifp != NULL); assert (babel_ifp != NULL);
babel_ifp->rtt_max = rtt; /* The value is entered in milliseconds but stored as microseconds. */
babel_ifp->rtt_max = rtt * 1000;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1328,6 +1330,27 @@ interface_config_write (struct vty *vty)
babel_ifp->update_interval); babel_ifp->update_interval);
write++; write++;
} }
if (CHECK_FLAG(babel_ifp->flags, BABEL_IF_TIMESTAMPS)) {
vty_out(vty, " babel enable-timestamps\n");
write++;
}
if (babel_ifp->max_rtt_penalty != BABEL_DEFAULT_MAX_RTT_PENALTY) {
vty_out(vty, " babel max-rtt-penalty %u\n",
babel_ifp->max_rtt_penalty);
write++;
}
if (babel_ifp->rtt_decay != BABEL_DEFAULT_RTT_DECAY) {
vty_out(vty, " babel rtt-decay %u\n", babel_ifp->rtt_decay);
write++;
}
if (babel_ifp->rtt_min != BABEL_DEFAULT_RTT_MIN) {
vty_out(vty, " babel rtt-min %u\n", babel_ifp->rtt_min / 1000);
write++;
}
if (babel_ifp->rtt_max != BABEL_DEFAULT_RTT_MAX) {
vty_out(vty, " babel rtt-max %u\n", babel_ifp->rtt_max / 1000);
write++;
}
/* Some parameters have different defaults for wired/wireless. */ /* Some parameters have different defaults for wired/wireless. */
if (CHECK_FLAG (babel_ifp->flags, BABEL_IF_WIRED)) { if (CHECK_FLAG (babel_ifp->flags, BABEL_IF_WIRED)) {
if (!CHECK_FLAG (babel_ifp->flags, BABEL_IF_SPLIT_HORIZON)) { if (!CHECK_FLAG (babel_ifp->flags, BABEL_IF_SPLIT_HORIZON)) {
@ -1395,9 +1418,10 @@ babel_interface_allocate (void)
babel_ifp->bucket_time = babel_now.tv_sec; babel_ifp->bucket_time = babel_now.tv_sec;
babel_ifp->bucket = BUCKET_TOKENS_MAX; babel_ifp->bucket = BUCKET_TOKENS_MAX;
babel_ifp->hello_seqno = (frr_weak_random() & 0xFFFF); babel_ifp->hello_seqno = (frr_weak_random() & 0xFFFF);
babel_ifp->rtt_min = 10000; babel_ifp->rtt_decay = BABEL_DEFAULT_RTT_DECAY;
babel_ifp->rtt_max = 120000; babel_ifp->rtt_min = BABEL_DEFAULT_RTT_MIN;
babel_ifp->max_rtt_penalty = 150; babel_ifp->rtt_max = BABEL_DEFAULT_RTT_MAX;
babel_ifp->max_rtt_penalty = BABEL_DEFAULT_MAX_RTT_PENALTY;
babel_ifp->hello_interval = BABEL_DEFAULT_HELLO_INTERVAL; babel_ifp->hello_interval = BABEL_DEFAULT_HELLO_INTERVAL;
babel_ifp->update_interval = BABEL_DEFAULT_UPDATE_INTERVAL; babel_ifp->update_interval = BABEL_DEFAULT_UPDATE_INTERVAL;
babel_ifp->channel = BABEL_IF_CHANNEL_INTERFERING; babel_ifp->channel = BABEL_IF_CHANNEL_INTERFERING;

6
babeld/babeld.h
View File

@ -81,6 +81,11 @@ THE SOFTWARE.
#define BABEL_DEFAULT_HELLO_INTERVAL 4000 #define BABEL_DEFAULT_HELLO_INTERVAL 4000
#define BABEL_DEFAULT_UPDATE_INTERVAL 16000 #define BABEL_DEFAULT_UPDATE_INTERVAL 16000
#define BABEL_DEFAULT_RESEND_DELAY 2000 #define BABEL_DEFAULT_RESEND_DELAY 2000
#define BABEL_DEFAULT_RTT_DECAY 42
/* Values in microseconds */
#define BABEL_DEFAULT_RTT_MIN 10000
#define BABEL_DEFAULT_RTT_MAX 120000
/* In units of seconds */ /* In units of seconds */
#define BABEL_DEFAULT_SMOOTHING_HALF_LIFE 4 #define BABEL_DEFAULT_SMOOTHING_HALF_LIFE 4
@ -90,6 +95,7 @@ THE SOFTWARE.
#define BABEL_DEFAULT_RXCOST_WIRED 96 #define BABEL_DEFAULT_RXCOST_WIRED 96
#define BABEL_DEFAULT_RXCOST_WIRELESS 256 #define BABEL_DEFAULT_RXCOST_WIRELESS 256
#define BABEL_DEFAULT_MAX_RTT_PENALTY 150
/* Babel structure. */ /* Babel structure. */
struct babel struct babel

6
doc/user/babeld.rst
View File

@ -132,7 +132,7 @@ Babel configuration
This specifies the minimum RTT, in milliseconds, starting from which we This specifies the minimum RTT, in milliseconds, starting from which we
increase the cost to a neighbour. The additional cost is linear in increase the cost to a neighbour. The additional cost is linear in
(rtt - rtt-min). The default is 100 ms. (rtt - rtt-min). The default is 10 ms.
.. clicmd:: babel rtt-max (1-65535) .. clicmd:: babel rtt-max (1-65535)
@ -144,8 +144,8 @@ Babel configuration
.. clicmd:: babel max-rtt-penalty (0-65535) .. clicmd:: babel max-rtt-penalty (0-65535)
This specifies the maximum cost added to a neighbour because of RTT, i.e. This specifies the maximum cost added to a neighbour because of RTT, i.e.
when the RTT is higher or equal than rtt-max. The default is 0, which when the RTT is higher or equal than rtt-max. The default is 150. Setting it
effectively disables the use of a RTT-based cost. to 0 effectively disables the use of a RTT-based cost.
.. clicmd:: babel enable-timestamps .. clicmd:: babel enable-timestamps