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

bgpd: cleanup special checks for views

Browse Source 
bgp->vrf_id is always VRF_DEFAULT for views. All these special checks
are not necessary.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-09-03 17:36:40 +03:00
parent 3cb67fef98
commit 2c1eba8e84
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_fsm.c
View File

@ -358,8 +358,7 @@ void bgp_timer_set(struct peer *peer)
status start timer is on unless peer is shutdown or peer is status start timer is on unless peer is shutdown or peer is
inactive. All other timer must be turned off */ inactive. All other timer must be turned off */
if (BGP_PEER_START_SUPPRESSED(peer) || !peer_active(peer) if (BGP_PEER_START_SUPPRESSED(peer) || !peer_active(peer)
|| (peer->bgp->inst_type != BGP_INSTANCE_TYPE_VIEW && || peer->bgp->vrf_id == VRF_UNKNOWN) {
peer->bgp->vrf_id == VRF_UNKNOWN)) {
BGP_TIMER_OFF(peer->t_start); BGP_TIMER_OFF(peer->t_start);
} else { } else {
BGP_TIMER_ON(peer->t_start, bgp_start_timer, BGP_TIMER_ON(peer->t_start, bgp_start_timer,
@ -1694,8 +1693,7 @@ int bgp_start(struct peer *peer)
return 0; return 0;
} }
if (peer->bgp->inst_type != BGP_INSTANCE_TYPE_VIEW && if (peer->bgp->vrf_id == VRF_UNKNOWN) {
peer->bgp->vrf_id == VRF_UNKNOWN) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
flog_err( flog_err(
EC_BGP_FSM, EC_BGP_FSM,

11
bgpd/bgp_network.c
View File

@ -173,9 +173,7 @@ static int bgp_md5_set_password(struct peer *peer, const char *password)
* must be the default vrf or a view instance * must be the default vrf or a view instance
*/ */
if (!listener->bgp) { if (!listener->bgp) {
if (peer->bgp->vrf_id != VRF_DEFAULT if (peer->bgp->vrf_id != VRF_DEFAULT)
&& peer->bgp->inst_type
!= BGP_INSTANCE_TYPE_VIEW)
continue; continue;
} else if (listener->bgp != peer->bgp) } else if (listener->bgp != peer->bgp)
continue; continue;
@ -853,8 +851,7 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
listener->name = XSTRDUP(MTYPE_BGP_LISTENER, bgp->name); listener->name = XSTRDUP(MTYPE_BGP_LISTENER, bgp->name);
/* this socket is in a vrf record bgp back pointer */ /* this socket is in a vrf record bgp back pointer */
if (bgp->vrf_id != VRF_DEFAULT if (bgp->vrf_id != VRF_DEFAULT)
&& bgp->inst_type != BGP_INSTANCE_TYPE_VIEW)
listener->bgp = bgp; listener->bgp = bgp;
memcpy(&listener->su, sa, salen); memcpy(&listener->su, sa, salen);
@ -906,9 +903,7 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
sock = vrf_socket(ainfo->ai_family, sock = vrf_socket(ainfo->ai_family,
ainfo->ai_socktype, ainfo->ai_socktype,
ainfo->ai_protocol, ainfo->ai_protocol,
(bgp->inst_type bgp->vrf_id,
!= BGP_INSTANCE_TYPE_VIEW
? bgp->vrf_id : VRF_DEFAULT),
(bgp->inst_type (bgp->inst_type
== BGP_INSTANCE_TYPE_VRF == BGP_INSTANCE_TYPE_VRF
? bgp->name : NULL)); ? bgp->name : NULL));