diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2021-03-17 10:45:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 10:45:43 +0000 |
| commit | 692b3561df04290418f47cb6805f79eee32a9067 (patch) | |
| tree | 18710b1b44d0f849204fe81cfa9436dd654a43b1 | |
| parent | 57e627628dbb38cf82e1f2e1a0288299fbee06b8 (diff) | |
| parent | f1825d571e2cf48922fe86d5158018a13bd75d4c (diff) | |
Merge pull request #8225 from idryzhov/bfd-echo-mode
bfdd: fix echo receive timer and disable echo mode
| -rw-r--r-- | bfdd/bfd.c | 4 | ||||
| -rw-r--r-- | bfdd/bfdd_cli.c | 4 | ||||
| -rw-r--r-- | doc/user/bfd.rst | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/bfdd/bfd.c b/bfdd/bfd.c index aa30ca8ad3..9e5bc20a49 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -501,8 +501,10 @@ void ptm_bfd_echo_stop(struct bfd_session *bfd) void ptm_bfd_echo_start(struct bfd_session *bfd) { bfd->echo_detect_TO = (bfd->remote_detect_mult * bfd->echo_xmt_TO); - if (bfd->echo_detect_TO > 0) + if (bfd->echo_detect_TO > 0) { + bfd_echo_recvtimer_update(bfd); ptm_bfd_echo_xmt_TO(bfd); + } } void ptm_bfd_sess_up(struct bfd_session *bfd) diff --git a/bfdd/bfdd_cli.c b/bfdd/bfdd_cli.c index 44e94eb898..ba80b2363f 100644 --- a/bfdd/bfdd_cli.c +++ b/bfdd/bfdd_cli.c @@ -433,6 +433,10 @@ DEFPY_YANG( return CMD_WARNING_CONFIG_FAILED; } + if (!no && !bglobal.bg_use_dplane) { + vty_out(vty, "%% Current implementation of echo mode works only when the peer is also FRR.\n"); + } + nb_cli_enqueue_change(vty, "./echo-mode", NB_OP_MODIFY, no ? "false" : "true"); return nb_cli_apply_changes(vty, NULL); diff --git a/doc/user/bfd.rst b/doc/user/bfd.rst index 4ee8376828..7d136b183e 100644 --- a/doc/user/bfd.rst +++ b/doc/user/bfd.rst @@ -180,7 +180,8 @@ BFD peers and profiles share the same BFD session configuration commands. .. clicmd:: echo-mode Enables or disables the echo transmission mode. This mode is disabled - by default. + by default. If you are not using distributed BFD then echo mode works + only when the peer is also FRR. It is recommended that the transmission interval of control packets to be increased after enabling echo-mode to reduce bandwidth usage. |