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

zebra: avoid using c++ keywords in headers

Browse Source 
to make sure that c++ code can include them, avoid using reserved
keywords like 'delete' or 'new'.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
This commit is contained in:
Emanuele Di Pascale 2020-05-14 15:57:23 +02:00
parent e3dafc2580
commit cd7108ba92
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zebra/rib.h
View File

@ -323,7 +323,8 @@ enum rib_update_event {
extern void route_entry_copy_nexthops(struct route_entry *re, extern void route_entry_copy_nexthops(struct route_entry *re,
struct nexthop *nh); struct nexthop *nh);
int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new); int route_entry_update_nhe(struct route_entry *re,
struct nhg_hash_entry *new_nhghe);
#define route_entry_dump(prefix, src, re) _route_entry_dump(__func__, prefix, src, re) #define route_entry_dump(prefix, src, re) _route_entry_dump(__func__, prefix, src, re)
extern void _route_entry_dump(const char *func, union prefixconstptr pp, extern void _route_entry_dump(const char *func, union prefixconstptr pp,

6
zebra/zebra_gr.c
View File

@ -133,7 +133,7 @@ static void zebra_gr_client_info_delte(struct zserv *client,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
/* Delete all the stale routes. */ /* Delete all the stale routes. */
info->delete = true; info->do_delete = true;
zebra_gr_delete_stale_routes(info); zebra_gr_delete_stale_routes(info);
XFREE(MTYPE_TMP, info); XFREE(MTYPE_TMP, info);
@ -456,7 +456,7 @@ static int32_t zebra_gr_route_stale_delete_timer_expiry(struct thread *thread)
/* Set the flag to indicate all stale route deletion */ /* Set the flag to indicate all stale route deletion */
if (thread->u.val == 1) if (thread->u.val == 1)
info->delete = true; info->do_delete = true;
cnt = zebra_gr_delete_stale_routes(info); cnt = zebra_gr_delete_stale_routes(info);
@ -581,7 +581,7 @@ static int32_t zebra_gr_delete_stale_route(struct client_gr_info *info,
* Store the current prefix and afi * Store the current prefix and afi
*/ */
if ((n >= ZEBRA_MAX_STALE_ROUTE_COUNT) if ((n >= ZEBRA_MAX_STALE_ROUTE_COUNT)
&& (info->delete == false)) { && (info->do_delete == false)) {
info->current_afi = afi; info->current_afi = afi;
info->current_prefix = XCALLOC( info->current_prefix = XCALLOC(
MTYPE_TMP, MTYPE_TMP,

11
zebra/zebra_rib.c
View File

@ -211,28 +211,29 @@ static void route_entry_attach_ref(struct route_entry *re,
zebra_nhg_increment_ref(new); zebra_nhg_increment_ref(new);
} }
int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new) int route_entry_update_nhe(struct route_entry *re,
struct nhg_hash_entry *new_nhghe)
{ {
struct nhg_hash_entry *old; struct nhg_hash_entry *old;
int ret = 0; int ret = 0;
if (new == NULL) { if (new_nhghe == NULL) {
if (re->nhe) if (re->nhe)
zebra_nhg_decrement_ref(re->nhe); zebra_nhg_decrement_ref(re->nhe);
re->nhe = NULL; re->nhe = NULL;
goto done; goto done;
} }
if ((re->nhe_id != 0) && (re->nhe_id != new->id)) { if ((re->nhe_id != 0) && (re->nhe_id != new_nhghe->id)) {
old = re->nhe; old = re->nhe;
route_entry_attach_ref(re, new); route_entry_attach_ref(re, new_nhghe);
if (old) if (old)
zebra_nhg_decrement_ref(old); zebra_nhg_decrement_ref(old);
} else if (!re->nhe) } else if (!re->nhe)
/* This is the first time it's being attached */ /* This is the first time it's being attached */
route_entry_attach_ref(re, new); route_entry_attach_ref(re, new_nhghe);
done: done:
return ret; return ret;

2
zebra/zserv.h
View File

@ -72,7 +72,7 @@ struct client_gr_info {
enum zserv_client_capabilities capabilities; enum zserv_client_capabilities capabilities;
/* GR commands */ /* GR commands */
bool delete; bool do_delete;
bool gr_enable; bool gr_enable;
bool stale_client; bool stale_client;