proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-18 04:55:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Convert variable withdraw integer to bool

Browse Source 
It holds only 0/1.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-12-08 11:58:59 +02:00
parent 6b79b560ab
commit 087d64a7d9
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_route.c
View File

@ -5164,7 +5164,7 @@ void bgp_withdraw(struct peer *peer, const struct prefix *p,
} }
void bgp_default_originate(struct peer *peer, afi_t afi, safi_t safi, void bgp_default_originate(struct peer *peer, afi_t afi, safi_t safi,
int withdraw) bool withdraw)
{ {
struct update_subgroup *subgrp; struct update_subgroup *subgrp;
subgrp = peer_subgroup(peer, afi, safi); subgrp = peer_subgroup(peer, afi, safi);

3
bgpd/bgp_route.h
View File

@ -707,7 +707,8 @@ extern void bgp_announce_route(struct peer *peer, afi_t afi, safi_t safi,
bool force); bool force);
extern void bgp_stop_announce_route_timer(struct peer_af *paf); extern void bgp_stop_announce_route_timer(struct peer_af *paf);
extern void bgp_announce_route_all(struct peer *); extern void bgp_announce_route_all(struct peer *);
extern void bgp_default_originate(struct peer *, afi_t, safi_t, int); extern void bgp_default_originate(struct peer *peer, afi_t afi, safi_t safi,
bool withdraw);
extern void bgp_soft_reconfig_table_task_cancel(const struct bgp *bgp, extern void bgp_soft_reconfig_table_task_cancel(const struct bgp *bgp,
const struct bgp_table *table, const struct bgp_table *table,
const struct peer *peer); const struct peer *peer);

8
bgpd/bgp_updgrp.c
View File

@ -1699,14 +1699,14 @@ static int updgrp_policy_update_walkcb(struct update_group *updgrp, void *arg)
*/ */
UNSET_FLAG(subgrp->sflags, UNSET_FLAG(subgrp->sflags,
SUBGRP_STATUS_DEFAULT_ORIGINATE); SUBGRP_STATUS_DEFAULT_ORIGINATE);
subgroup_default_originate(subgrp, 0); subgroup_default_originate(subgrp, false);
} else { } else {
/* /*
* This is a explicit withdraw, since the * This is a explicit withdraw, since the
* routemap is not present in routemap lib. need * routemap is not present in routemap lib. need
* to pass 1 for withdraw arg. * to pass `true` for withdraw arg.
*/ */
subgroup_default_originate(subgrp, 1); subgroup_default_originate(subgrp, true);
} }
} }
update_subgroup_set_needs_refresh(subgrp, 0); update_subgroup_set_needs_refresh(subgrp, 0);
@ -2102,7 +2102,7 @@ update_group_default_originate_route_map_walkcb(struct update_group *updgrp,
*/ */
UNSET_FLAG(subgrp->sflags, UNSET_FLAG(subgrp->sflags,
SUBGRP_STATUS_DEFAULT_ORIGINATE); SUBGRP_STATUS_DEFAULT_ORIGINATE);
subgroup_default_originate(subgrp, 0); subgroup_default_originate(subgrp, false);
} }
} }

2
bgpd/bgp_updgrp.h
View File

@ -428,7 +428,7 @@ extern void subgroup_announce_route(struct update_subgroup *subgrp);
extern void subgroup_announce_all(struct update_subgroup *subgrp); extern void subgroup_announce_all(struct update_subgroup *subgrp);
extern void subgroup_default_originate(struct update_subgroup *subgrp, extern void subgroup_default_originate(struct update_subgroup *subgrp,
int withdraw); bool withdraw);
extern void group_announce_route(struct bgp *bgp, afi_t afi, safi_t safi, extern void group_announce_route(struct bgp *bgp, afi_t afi, safi_t safi,
struct bgp_dest *dest, struct bgp_dest *dest,
struct bgp_path_info *pi); struct bgp_path_info *pi);

6
bgpd/bgp_updgrp_adv.c
View File

@ -733,7 +733,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
if (safi != SAFI_MPLS_VPN && safi != SAFI_ENCAP && safi != SAFI_EVPN if (safi != SAFI_MPLS_VPN && safi != SAFI_ENCAP && safi != SAFI_EVPN
&& CHECK_FLAG(peer->af_flags[afi][safi], && CHECK_FLAG(peer->af_flags[afi][safi],
PEER_FLAG_DEFAULT_ORIGINATE)) PEER_FLAG_DEFAULT_ORIGINATE))
subgroup_default_originate(subgrp, 0); subgroup_default_originate(subgrp, false);
subgrp->pscount = 0; subgrp->pscount = 0;
SET_FLAG(subgrp->sflags, SUBGRP_STATUS_TABLE_REPARSING); SET_FLAG(subgrp->sflags, SUBGRP_STATUS_TABLE_REPARSING);
@ -825,7 +825,7 @@ void subgroup_announce_route(struct update_subgroup *subgrp)
} }
} }
void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw) void subgroup_default_originate(struct update_subgroup *subgrp, bool withdraw)
{ {
struct bgp *bgp; struct bgp *bgp;
struct attr attr; struct attr attr;
@ -940,7 +940,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
SUBGRP_STATUS_DEFAULT_ORIGINATE))) SUBGRP_STATUS_DEFAULT_ORIGINATE)))
SET_FLAG(subgrp->sflags, SET_FLAG(subgrp->sflags,
SUBGRP_STATUS_DEFAULT_ORIGINATE); SUBGRP_STATUS_DEFAULT_ORIGINATE);
withdraw = 1; withdraw = true;
} }
} }

8
bgpd/bgpd.c
View File

@ -5655,7 +5655,7 @@ int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
if (peer_established(peer->connection) && if (peer_established(peer->connection) &&
peer->afc_nego[afi][safi]) { peer->afc_nego[afi][safi]) {
update_group_adjust_peer(peer_af_find(peer, afi, safi)); update_group_adjust_peer(peer_af_find(peer, afi, safi));
bgp_default_originate(peer, afi, safi, 0); bgp_default_originate(peer, afi, safi, false);
bgp_announce_route(peer, afi, safi, false); bgp_announce_route(peer, afi, safi, false);
} }
@ -5698,7 +5698,7 @@ int peer_default_originate_set(struct peer *peer, afi_t afi, safi_t safi,
member->afc_nego[afi][safi]) { member->afc_nego[afi][safi]) {
update_group_adjust_peer( update_group_adjust_peer(
peer_af_find(member, afi, safi)); peer_af_find(member, afi, safi));
bgp_default_originate(member, afi, safi, 0); bgp_default_originate(member, afi, safi, false);
bgp_announce_route(member, afi, safi, false); bgp_announce_route(member, afi, safi, false);
} }
} }
@ -5743,7 +5743,7 @@ int peer_default_originate_unset(struct peer *peer, afi_t afi, safi_t safi)
if (peer_established(peer->connection) && if (peer_established(peer->connection) &&
peer->afc_nego[afi][safi]) { peer->afc_nego[afi][safi]) {
update_group_adjust_peer(peer_af_find(peer, afi, safi)); update_group_adjust_peer(peer_af_find(peer, afi, safi));
bgp_default_originate(peer, afi, safi, 1); bgp_default_originate(peer, afi, safi, true);
bgp_announce_route(peer, afi, safi, false); bgp_announce_route(peer, afi, safi, false);
} }
@ -5782,7 +5782,7 @@ int peer_default_originate_unset(struct peer *peer, afi_t afi, safi_t safi)
if (peer_established(member->connection) && if (peer_established(member->connection) &&
member->afc_nego[afi][safi]) { member->afc_nego[afi][safi]) {
update_group_adjust_peer(peer_af_find(member, afi, safi)); update_group_adjust_peer(peer_af_find(member, afi, safi));
bgp_default_originate(member, afi, safi, 1); bgp_default_originate(member, afi, safi, true);
bgp_announce_route(member, afi, safi, false); bgp_announce_route(member, afi, safi, false);
} }
} }