diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2021-03-17 11:45:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 11:45:43 +0100 |
| commit | 692b3561df04290418f47cb6805f79eee32a9067 (patch) | |
| tree | 18710b1b44d0f849204fe81cfa9436dd654a43b1 /bfdd | |
| parent | Merge pull request #8229 from idryzhov/bfdd-echo-rx-tx (diff) | |
| parent | bfdd: warn users about echo-mode restrictions (diff) | |
| download | frr-692b3561df04290418f47cb6805f79eee32a9067.tar.xz frr-692b3561df04290418f47cb6805f79eee32a9067.zip | |
Merge pull request #8225 from idryzhov/bfd-echo-mode
bfdd: fix echo receive timer and disable echo mode
Diffstat (limited to 'bfdd')
| -rw-r--r-- | bfdd/bfd.c | 4 | ||||
| -rw-r--r-- | bfdd/bfdd_cli.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bfdd/bfd.c b/bfdd/bfd.c index aa30ca8ad..9e5bc20a4 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 44e94eb89..ba80b2363 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); |