mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 10:11:53 +00:00
Code Releases Activity

Neighbor prune fixup

Browse Source
This commit is contained in:
Maria Matejka 2022-02-01 14:54:03 +01:00
parent c019008383
commit 09380db594
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nest/iface.h
View File

@ -160,7 +160,7 @@ neighbor *neigh_find(struct proto *p, ip_addr a, struct iface *ifa, uint flags);
void neigh_dump(neighbor *); void neigh_dump(neighbor *);
void neigh_dump_all(void); void neigh_dump_all(void);
void neigh_prune(void); void neigh_prune(struct proto *p);
void neigh_if_up(struct iface *); void neigh_if_up(struct iface *);
void neigh_if_down(struct iface *); void neigh_if_down(struct iface *);
void neigh_if_link(struct iface *); void neigh_if_link(struct iface *);

17
nest/neighbor.c
View File

@ -61,6 +61,7 @@ static slab *neigh_slab;
static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list; static list neigh_hash_table[NEIGH_HASH_SIZE], sticky_neigh_list;
static void neigh_do_notify(void *); static void neigh_do_notify(void *);
static void neigh_do_notify_main(void *); static void neigh_do_notify_main(void *);
static void neigh_free(neighbor *n);
static inline uint static inline uint
neigh_hash(struct proto *p, ip_addr a, struct iface *i) neigh_hash(struct proto *p, ip_addr a, struct iface *i)
@ -372,6 +373,9 @@ neigh_do_notify(void *data)
if (n->proto->proto_state != PS_STOP) if (n->proto->proto_state != PS_STOP)
n->proto->neigh_notify(n); n->proto->neigh_notify(n);
if ((n->scope < 0) && !(n->flags & NEF_STICKY))
neigh_free(n);
} }
static void static void
@ -402,7 +406,7 @@ neigh_down(neighbor *n)
neigh_notify(n); neigh_notify(n);
} }
static inline void static void
neigh_free(neighbor *n) neigh_free(neighbor *n)
{ {
ASSERT_DIE(birdloop_inside(n->proto->loop)); ASSERT_DIE(birdloop_inside(n->proto->loop));
@ -480,12 +484,6 @@ neigh_update(neighbor *n, struct iface *iface)
if (n->scope >= 0) if (n->scope >= 0)
neigh_down(n); neigh_down(n);
if ((n->scope < 0) && !(n->flags & NEF_STICKY))
{
neigh_free(n);
return;
}
if (scope >= 0) if (scope >= 0)
neigh_up(n, iface, ifa, scope); neigh_up(n, iface, ifa, scope);
} }
@ -630,7 +628,7 @@ neigh_prune_one(neighbor *n)
* is shut down to get rid of all its heritage. * is shut down to get rid of all its heritage.
*/ */
void void
neigh_prune(void) neigh_prune(struct proto *p)
{ {
neighbor *n; neighbor *n;
node *m; node *m;
@ -641,7 +639,8 @@ neigh_prune(void)
DBG("Pruning neighbors\n"); DBG("Pruning neighbors\n");
for(i=0; i<NEIGH_HASH_SIZE; i++) for(i=0; i<NEIGH_HASH_SIZE; i++)
WALK_LIST_DELSAFE(n, m, neigh_hash_table[i]) WALK_LIST_DELSAFE(n, m, neigh_hash_table[i])
neigh_prune_one(n); if (n->proto == p)
neigh_prune_one(n);
IFACE_UNLOCK; IFACE_UNLOCK;
} }

2
nest/proto.c
View File

@ -2434,7 +2434,7 @@ static void
proto_do_down(struct proto *p) proto_do_down(struct proto *p)
{ {
p->down_code = 0; p->down_code = 0;
neigh_prune(); neigh_prune(p);
/* Shutdown is finished in the protocol event */ /* Shutdown is finished in the protocol event */
if (proto_is_done(p)) if (proto_is_done(p))