proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 16:29:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bfdd: simplify session observers code

Browse Source 
Don't be selective about what to observe, always observe all possible
aspects of the session that may change on run-time (i.e. bind address,
interface and VRF existence).

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2019-10-11 16:13:24 -03:00
parent 8ee0862e80
commit ced291deb7
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bfdd/bfd.c
View File

@ -1217,19 +1217,10 @@ int bs_observer_add(struct bfd_session *bs)
struct bfd_session_observer *bso; struct bfd_session_observer *bso;
bso = XCALLOC(MTYPE_BFDD_SESSION_OBSERVER, sizeof(*bso)); bso = XCALLOC(MTYPE_BFDD_SESSION_OBSERVER, sizeof(*bso));
bso->bso_isaddress = false;
bso->bso_bs = bs; bso->bso_bs = bs;
bso->bso_isinterface = !BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH); bso->bso_addr.family = bs->key.family;
if (bso->bso_isinterface) memcpy(&bso->bso_addr.u.prefix, &bs->key.local,
strlcpy(bso->bso_entryname, bs->key.ifname, sizeof(bs->key.local));
sizeof(bso->bso_entryname));
/* Handle socket binding failures caused by missing local addresses. */
if (bs->sock == -1) {
bso->bso_isaddress = true;
bso->bso_addr.family = bs->key.family;
memcpy(&bso->bso_addr.u.prefix, &bs->key.local,
sizeof(bs->key.local));
}
TAILQ_INSERT_TAIL(&bglobal.bg_obslist, bso, bso_entry); TAILQ_INSERT_TAIL(&bglobal.bg_obslist, bso, bso_entry);

8
bfdd/bfd.h
View File

@ -274,12 +274,8 @@ struct bfd_state_str_list {
struct bfd_session_observer { struct bfd_session_observer {
struct bfd_session *bso_bs; struct bfd_session *bso_bs;
bool bso_isinterface; char bso_entryname[MAXNAMELEN];
bool bso_isaddress; struct prefix bso_addr;
union {
char bso_entryname[MAXNAMELEN];
struct prefix bso_addr;
};
TAILQ_ENTRY(bfd_session_observer) bso_entry; TAILQ_ENTRY(bfd_session_observer) bso_entry;
}; };

13
bfdd/ptm_adapter.c
View File

@ -579,8 +579,6 @@ static void bfdd_sessions_enable_interface(struct interface *ifp)
TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) { TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
bs = bso->bso_bs; bs = bso->bso_bs;
if (bso->bso_isinterface == false)
continue;
/* Interface name mismatch. */ /* Interface name mismatch. */
if (strcmp(ifp->name, bs->key.ifname)) if (strcmp(ifp->name, bs->key.ifname))
continue; continue;
@ -605,10 +603,6 @@ static void bfdd_sessions_disable_interface(struct interface *ifp)
struct bfd_session *bs; struct bfd_session *bs;
TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) { TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
if (bso->bso_isinterface == false)
continue;
/* Interface name mismatch. */
bs = bso->bso_bs; bs = bso->bso_bs;
if (strcmp(ifp->name, bs->key.ifname)) if (strcmp(ifp->name, bs->key.ifname))
continue; continue;
@ -616,7 +610,6 @@ static void bfdd_sessions_disable_interface(struct interface *ifp)
if (bs->sock == -1) if (bs->sock == -1)
continue; continue;
/* Try to enable it. */
bfd_session_disable(bs); bfd_session_disable(bs);
} }
@ -658,8 +651,6 @@ void bfdd_sessions_disable_vrf(struct vrf *vrf)
struct bfd_session *bs; struct bfd_session *bs;
TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) { TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
if (bso->bso_isinterface)
continue;
bs = bso->bso_bs; bs = bso->bso_bs;
if (bs->key.vrfname[0] && if (bs->key.vrfname[0] &&
strcmp(vrf->name, bs->key.vrfname)) strcmp(vrf->name, bs->key.vrfname))
@ -668,7 +659,6 @@ void bfdd_sessions_disable_vrf(struct vrf *vrf)
if (bs->sock == -1) if (bs->sock == -1)
continue; continue;
/* Try to enable it. */
bfd_session_disable(bs); bfd_session_disable(bs);
} }
} }
@ -701,9 +691,6 @@ static void bfdd_sessions_enable_address(struct connected *ifc)
struct prefix prefix; struct prefix prefix;
TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) { TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
if (bso->bso_isaddress == false)
continue;
/* Skip enabled sessions. */ /* Skip enabled sessions. */
bs = bso->bso_bs; bs = bso->bso_bs;
if (bs->sock != -1) if (bs->sock != -1)