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

Merge pull request #2743 from donaldsharp/bgp_null_stuff

Browse Source 
Put back some removed Code
This commit is contained in:
Lou Berger 2018-07-27 12:45:08 -04:00 committed by GitHub
commit 729fa7048b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_route.c
View File

@ -188,7 +188,7 @@ static void bgp_info_extra_free(struct bgp_info_extra **extra)
struct bgp_info *bi = (struct bgp_info *)e->parent; struct bgp_info *bi = (struct bgp_info *)e->parent;
if (bi->net) if (bi->net)
bgp_unlock_node((struct bgp_node *)bi->net); bi->net = bgp_unlock_node((struct bgp_node *)bi->net);
bgp_info_unlock(e->parent); bgp_info_unlock(e->parent);
e->parent = NULL; e->parent = NULL;
} }

4
bgpd/bgp_table.h
View File

@ -128,9 +128,9 @@ static inline struct bgp_node *bgp_node_parent_nolock(struct bgp_node *node)
/* /*
* bgp_unlock_node * bgp_unlock_node
*/ */
static inline void bgp_unlock_node(struct bgp_node *node) static inline struct bgp_node *bgp_unlock_node(struct bgp_node *node)
{ {
route_unlock_node(bgp_node_to_rnode(node)); return (struct bgp_node *)route_unlock_node(bgp_node_to_rnode(node));
} }
/* /*

8
lib/table.h
View File

@ -233,13 +233,17 @@ static inline struct route_node *route_lock_node(struct route_node *node)
} }
/* Unlock node. */ /* Unlock node. */
static inline void route_unlock_node(struct route_node *node) static inline struct route_node *route_unlock_node(struct route_node *node)
{ {
assert(node->lock > 0); assert(node->lock > 0);
(*(unsigned *)&node->lock)--; (*(unsigned *)&node->lock)--;
if (node->lock == 0) if (node->lock == 0) {
route_node_delete(node); route_node_delete(node);
return NULL;
}
return node;
} }
/* /*