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

bfdd: make sessions administratively up by default

Browse Source 
Current behavior is inconsistent. When the session is created by another
daemon, it is up by default. When we later configure peer in bfdd, the
session is still up, but the NB layer thinks that it is down.

More than that, even when the session is created in bfdd using peer
command, it is created in DOWN state, not ADM_DOWN. And it actually
starts sending and receiving packets. The sessions is marked with
SHUTDOWN flag only when we try to reconfigure some parameter. This
behavior is also very unexpected.

Fixes #7780.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-03-10 22:11:19 +03:00
parent e319ed4c49
commit 59dad8137e
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfdd/bfd.c
View File

@ -85,7 +85,7 @@ struct bfd_profile *bfd_profile_lookup(const char *name)
static void bfd_profile_set_default(struct bfd_profile *bp) static void bfd_profile_set_default(struct bfd_profile *bp)
{ {
bp->admin_shutdown = true; bp->admin_shutdown = false;
bp->detection_multiplier = BFD_DEFDETECTMULT; bp->detection_multiplier = BFD_DEFDETECTMULT;
bp->echo_mode = false; bp->echo_mode = false;
bp->passive = false; bp->passive = false;
@ -206,7 +206,7 @@ void bfd_session_apply(struct bfd_session *bs)
bfd_set_passive_mode(bs, bs->peer_profile.passive); bfd_set_passive_mode(bs, bs->peer_profile.passive);
/* Toggle 'no shutdown' if default value. */ /* Toggle 'no shutdown' if default value. */
if (bs->peer_profile.admin_shutdown) if (bs->peer_profile.admin_shutdown == false)
bfd_set_shutdown(bs, bp->admin_shutdown); bfd_set_shutdown(bs, bp->admin_shutdown);
else else
bfd_set_shutdown(bs, bs->peer_profile.admin_shutdown); bfd_set_shutdown(bs, bs->peer_profile.admin_shutdown);

2
bfdd/bfdd_cli.c
View File

@ -274,7 +274,7 @@ void bfd_cli_show_shutdown(struct vty *vty, struct lyd_node *dnode,
bool show_defaults) bool show_defaults)
{ {
if (show_defaults) if (show_defaults)
vty_out(vty, " shutdown\n"); vty_out(vty, " no shutdown\n");
else else
vty_out(vty, " %sshutdown\n", vty_out(vty, " %sshutdown\n",
yang_dnode_get_bool(dnode, NULL) ? "" : "no "); yang_dnode_get_bool(dnode, NULL) ? "" : "no ");

2
bfdd/bfdd_vty.c
View File

@ -840,7 +840,7 @@ static int bfd_configure_peer(struct bfd_peer_cfg *bpc, bool mhop,
memset(bpc, 0, sizeof(*bpc)); memset(bpc, 0, sizeof(*bpc));
/* Defaults */ /* Defaults */
bpc->bpc_shutdown = true; bpc->bpc_shutdown = false;
bpc->bpc_detectmultiplier = BPC_DEF_DETECTMULTIPLIER; bpc->bpc_detectmultiplier = BPC_DEF_DETECTMULTIPLIER;
bpc->bpc_recvinterval = BPC_DEF_RECEIVEINTERVAL; bpc->bpc_recvinterval = BPC_DEF_RECEIVEINTERVAL;
bpc->bpc_txinterval = BPC_DEF_TRANSMITINTERVAL; bpc->bpc_txinterval = BPC_DEF_TRANSMITINTERVAL;

3
bfdd/ptm_adapter.c
View File

@ -492,9 +492,6 @@ static void bfdd_dest_register(struct stream *msg, vrf_id_t vrf_id)
"ptm-add-dest: failed to create BFD session"); "ptm-add-dest: failed to create BFD session");
return; return;
} }
/* Protocol created peers are 'no shutdown' by default. */
bs->peer_profile.admin_shutdown = false;
} else { } else {
/* /*
* BFD session was already created, we are just updating the * BFD session was already created, we are just updating the

2
yang/frr-bfdd.yang
View File

@ -185,7 +185,7 @@ module frr-bfdd {
leaf administrative-down { leaf administrative-down {
type boolean; type boolean;
default true; default false;
description "Disables or enables the session administratively"; description "Disables or enables the session administratively";
} }