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

Interfaces and neighbor notifications do properly enter protocol loops

Browse Source
This commit is contained in:
Maria Matejka 2022-01-12 14:06:49 +01:00
parent b5155d5cea
commit b6c9263543
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nest/iface.c
View File

@ -166,7 +166,8 @@ ifa_notify_change_(unsigned c, struct ifa *a)
DBG("IFA change notification (%x) for %s:%I\n", c, a->iface->name, a->ip); DBG("IFA change notification (%x) for %s:%I\n", c, a->iface->name, a->ip);
WALK_LIST(p, proto_list) WALK_LIST(p, proto_list)
ifa_send_notify(p, c, a); PROTO_LOCKED_FROM_MAIN(p)
ifa_send_notify(p, c, a);
} }
static inline void static inline void
@ -226,7 +227,8 @@ if_notify_change(unsigned c, struct iface *i)
ifa_notify_change_(IF_CHANGE_DOWN, a); ifa_notify_change_(IF_CHANGE_DOWN, a);
WALK_LIST(p, proto_list) WALK_LIST(p, proto_list)
if_send_notify(p, c, i); PROTO_LOCKED_FROM_MAIN(p)
if_send_notify(p, c, i);
if (c & IF_CHANGE_UP) if (c & IF_CHANGE_UP)
WALK_LIST(a, i->addrs) WALK_LIST(a, i->addrs)

10
nest/neighbor.c
View File

@ -210,6 +210,8 @@ if_intersect(struct iface *ia, struct iface *ib)
neighbor * neighbor *
neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags) neigh_find(struct proto *p, ip_addr a, struct iface *iface, uint flags)
{ {
ASSERT_DIE(birdloop_inside(&main_birdloop));
neighbor *n; neighbor *n;
int class, scope = -1; int class, scope = -1;
uint h = neigh_hash(p, a, iface); uint h = neigh_hash(p, a, iface);
@ -308,8 +310,12 @@ neigh_dump_all(void)
static inline void static inline void
neigh_notify(neighbor *n) neigh_notify(neighbor *n)
{ {
if (n->proto->neigh_notify && (n->proto->proto_state != PS_STOP)) if (!n->proto->neigh_notify)
n->proto->neigh_notify(n); return;
PROTO_LOCKED_FROM_MAIN(n->proto)
if (n->proto->proto_state != PS_STOP)
n->proto->neigh_notify(n);
} }
static void static void

15
nest/proto.c
View File

@ -70,17 +70,6 @@ static inline event_list *proto_work_list(struct proto *p)
static inline void proto_send_event(struct proto *p) static inline void proto_send_event(struct proto *p)
{ ev_send(proto_event_list(p), p->event); } { ev_send(proto_event_list(p), p->event); }
#define PROTO_ENTER_FROM_MAIN(p) ({ \
ASSERT_DIE(birdloop_inside(&main_birdloop)); \
struct birdloop *_loop = (p)->loop; \
if (_loop != &main_birdloop) birdloop_enter(_loop); \
_loop; \
})
#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
#define PROTO_LOCKED_FROM_MAIN(p) for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
static inline int channel_is_active(struct channel *c) static inline int channel_is_active(struct channel *c)
{ return (c->channel_state != CS_DOWN); } { return (c->channel_state != CS_DOWN); }
@ -2389,6 +2378,8 @@ static struct rte_owner_class default_rte_owner_class;
static inline void static inline void
proto_do_start(struct proto *p) proto_do_start(struct proto *p)
{ {
ASSERT_DIE(birdloop_inside(p->loop));
p->active = 1; p->active = 1;
rt_init_sources(&p->sources, p->name, proto_work_list(p)); rt_init_sources(&p->sources, p->name, proto_work_list(p));
@ -2402,6 +2393,8 @@ proto_do_start(struct proto *p)
static void static void
proto_do_up(struct proto *p) proto_do_up(struct proto *p)
{ {
ASSERT_DIE(birdloop_inside(p->loop));
if (!p->main_source) if (!p->main_source)
p->main_source = rt_get_source(p, 0); p->main_source = rt_get_source(p, 0);
// Locked automaticaly // Locked automaticaly

12
nest/protocol.h
View File

@ -268,6 +268,18 @@ struct proto *proto_iterate_named(struct symbol *sym, struct protocol *proto, st
#define PROTO_WALK_CMD(sym,pr,p) for(struct proto *p = NULL; p = proto_iterate_named(sym, pr, p); ) #define PROTO_WALK_CMD(sym,pr,p) for(struct proto *p = NULL; p = proto_iterate_named(sym, pr, p); )
#define PROTO_ENTER_FROM_MAIN(p) ({ \
ASSERT_DIE(birdloop_inside(&main_birdloop)); \
struct birdloop *_loop = (p)->loop; \
if (_loop != &main_birdloop) birdloop_enter(_loop); \
_loop; \
})
#define PROTO_LEAVE_FROM_MAIN(loop) ({ if (loop != &main_birdloop) birdloop_leave(loop); })
#define PROTO_LOCKED_FROM_MAIN(p) for (struct birdloop *_proto_loop = PROTO_ENTER_FROM_MAIN(p); _proto_loop; PROTO_LEAVE_FROM_MAIN(_proto_loop), (_proto_loop = NULL))
#define CMD_RELOAD 0 #define CMD_RELOAD 0
#define CMD_RELOAD_IN 1 #define CMD_RELOAD_IN 1
#define CMD_RELOAD_OUT 2 #define CMD_RELOAD_OUT 2