mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

KRT: Remove KRF_SYNC_ERROR flag

Browse Source 
This info is now stored in an internal bmap. Unfortunately, net.flags
is still needed for temporary kernel data.
This commit is contained in:
Ondrej Zajicek (work)
2019-12-19 16:34:35 +01:00
parent 90a9c97e38
commit cc75b3e1dc
6 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysdep/unix/krt.c
View File

@@ -677,7 +677,7 @@ krt_got_route(struct krt_proto *p, rte *e)
if (!new)
verdict = KRF_DELETE;
else if ((net->n.flags & KRF_SYNC_ERROR) || !krt_same_dest(e, new))
else if (!bmap_test(&p->sync_map, new->id) || !krt_same_dest(e, new))
verdict = KRF_UPDATE;
else
verdict = KRF_SEEN;
@@ -1094,6 +1094,7 @@ krt_start(struct proto *P)
default: log(L_ERR "KRT: Tried to start with strange net type: %d", p->p.net_type); return PS_START; break;
}
bmap_init(&p->sync_map, p->p.pool, 1024);
add_tail(&krt_proto_list, &p->krt_node);
#ifdef KRT_ALLOW_LEARN
@@ -1133,6 +1134,7 @@ krt_shutdown(struct proto *P)
krt_sys_shutdown(p);
rem_node(&p->krt_node);
bmap_free(&p->sync_map);
return PS_DOWN;
}

9
sysdep/unix/krt.h
View File

@@ -65,6 +65,7 @@ struct krt_proto {
timer *scan_timer;
#endif
struct bmap sync_map; /* Keeps track which exported routes were successfully written to kernel */
node krt_node; /* Node in krt_proto_list */
byte af; /* Kernel address family (AF_*) */
byte ready; /* Initial feed has been finished */
@@ -86,6 +87,14 @@ void kif_request_scan(void);
void krt_got_route(struct krt_proto *p, struct rte *e);
void krt_got_route_async(struct krt_proto *p, struct rte *e, int new);
static inline int
krt_get_sync_error(struct krt_proto *p, struct rte *e)
{
return (p->p.proto_state == PS_UP) &&
bmap_test(&p->p.main_channel->export_map, e->id) &&
!bmap_test(&p->sync_map, e->id);
}
/* Values for rte->u.krt_sync.src */
#define KRT_SRC_UNKNOWN -1 /* Nobody knows */
#define KRT_SRC_BIRD 0 /* Our route (not passed in async mode) */