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

bgpd: Reuse is_stopping() in RPKI code same as with is_running()

Browse Source 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-04-05 14:14:00 +03:00
parent 01fcc18982
commit 9ca44fc8ef
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_rpki.c
View File

@ -123,6 +123,7 @@ static int add_tcp_cache(const char *host, const char *port,
static void print_record(const struct pfx_record *record, struct vty *vty); static void print_record(const struct pfx_record *record, struct vty *vty);
static int is_synchronized(void); static int is_synchronized(void);
static int is_running(void); static int is_running(void);
static int is_stopping(void);
static void route_match_free(void *rule); static void route_match_free(void *rule);
static enum route_map_cmd_result_t route_match(void *rule, static enum route_map_cmd_result_t route_match(void *rule,
const struct prefix *prefix, const struct prefix *prefix,
@ -340,6 +341,11 @@ inline int is_running(void)
return rtr_is_running; return rtr_is_running;
} }
inline int is_stopping(void)
{
return rtr_is_stopping;
}
static struct prefix *pfx_record_to_prefix(struct pfx_record *record) static struct prefix *pfx_record_to_prefix(struct pfx_record *record)
{ {
struct prefix *prefix = prefix_new(); struct prefix *prefix = prefix_new();
@ -481,7 +487,7 @@ static void rpki_connection_status_cb(const struct rtr_mgr_group *group
struct pfx_record rec = {0}; struct pfx_record rec = {0};
int retval; int retval;
if (rtr_is_stopping || if (is_stopping() ||
atomic_load_explicit(&rtr_update_overflow, memory_order_seq_cst)) atomic_load_explicit(&rtr_update_overflow, memory_order_seq_cst))
return; return;
@ -501,8 +507,8 @@ static void rpki_update_cb_sync_rtr(struct pfx_table *p __attribute__((unused)),
const struct pfx_record rec, const struct pfx_record rec,
const bool added __attribute__((unused))) const bool added __attribute__((unused)))
{ {
if (rtr_is_stopping if (is_stopping() ||
|| atomic_load_explicit(&rtr_update_overflow, memory_order_seq_cst)) atomic_load_explicit(&rtr_update_overflow, memory_order_seq_cst))
return; return;
int retval = int retval =