proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 20:01:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7735 from ton31337/fix/move_to_options_bgp_master_extra_zebra_data

Browse Source 
bgpd: Use bgp master flags for send extra data to zebra
This commit is contained in:
Russ White 2020-12-15 07:14:17 -05:00 committed by GitHub
commit a1333d8e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_vty.c
View File

@ -1616,7 +1616,10 @@ DEFPY (no_bgp_send_extra_data,
"Extra data to Zebra for display/use\n" "Extra data to Zebra for display/use\n"
"To zebra\n") "To zebra\n")
{ {
bgp_option_send_extra_data(!!no); if (no)
UNSET_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA);
else
SET_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -16958,7 +16961,7 @@ int bgp_config_write(struct vty *vty)
if (bgp_option_check(BGP_OPT_NO_FIB)) if (bgp_option_check(BGP_OPT_NO_FIB))
vty_out(vty, "bgp no-rib\n"); vty_out(vty, "bgp no-rib\n");
if (bm->send_extra_data_to_zebra) if (!CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA))
vty_out(vty, "no bgp send-extra-data zebra\n"); vty_out(vty, "no bgp send-extra-data zebra\n");
/* BGP configuration. */ /* BGP configuration. */

2
bgpd/bgp_zebra.c
View File

@ -1410,7 +1410,7 @@ void bgp_zebra_announce(struct bgp_dest *dest, const struct prefix *p,
is_add = (valid_nh_count || nhg_id) ? true : false; is_add = (valid_nh_count || nhg_id) ? true : false;
if (is_add && bm->send_extra_data_to_zebra) { if (is_add && CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA)) {
struct aspath *aspath = info->attr->aspath; struct aspath *aspath = info->attr->aspath;
SET_FLAG(api.message, ZAPI_MESSAGE_OPAQUE); SET_FLAG(api.message, ZAPI_MESSAGE_OPAQUE);

8
bgpd/bgpd.c
View File

@ -7418,11 +7418,6 @@ char *peer_uptime(time_t uptime2, char *buf, size_t len, bool use_json,
return buf; return buf;
} }
void bgp_option_send_extra_data(bool send)
{
bm->send_extra_data_to_zebra = send;
}
void bgp_master_init(struct thread_master *master, const int buffer_size) void bgp_master_init(struct thread_master *master, const int buffer_size)
{ {
qobj_init(); qobj_init();
@ -7441,9 +7436,10 @@ void bgp_master_init(struct thread_master *master, const int buffer_size)
bm->v_establish_wait = BGP_UPDATE_DELAY_DEF; bm->v_establish_wait = BGP_UPDATE_DELAY_DEF;
bm->terminating = false; bm->terminating = false;
bm->socket_buffer = buffer_size; bm->socket_buffer = buffer_size;
bm->send_extra_data_to_zebra = true;
bm->wait_for_fib = false; bm->wait_for_fib = false;
SET_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA);
bgp_mac_init(); bgp_mac_init();
/* init the rd id space. /* init the rd id space.
assign 0th index in the bitfield, assign 0th index in the bitfield,

6
bgpd/bgpd.h
View File

@ -171,9 +171,7 @@ struct bgp_master {
uint32_t flags; uint32_t flags;
#define BM_FLAG_GRACEFUL_SHUTDOWN (1 << 0) #define BM_FLAG_GRACEFUL_SHUTDOWN (1 << 0)
#define BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA (1 << 1)
/* Send extra data to zebra like aspath */
bool send_extra_data_to_zebra;
bool terminating; /* global flag that sigint terminate seen */ bool terminating; /* global flag that sigint terminate seen */
QOBJ_FIELDS QOBJ_FIELDS
@ -2254,8 +2252,6 @@ static inline bool bgp_in_graceful_shutdown(struct bgp *bgp)
extern void bgp_unset_redist_vrf_bitmaps(struct bgp *, vrf_id_t); extern void bgp_unset_redist_vrf_bitmaps(struct bgp *, vrf_id_t);
extern void bgp_option_send_extra_data(bool send);
/* For benefit of rfapi */ /* For benefit of rfapi */
extern struct peer *peer_new(struct bgp *bgp); extern struct peer *peer_new(struct bgp *bgp);