diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-09-12 16:33:29 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-09-12 16:33:29 +0200 |
| commit | f2dd602fef2ecf0a6598b817d71ce2ee8fadd5cc (patch) | |
| tree | 5f6a44704530554148565c7f0a563ad124bd79c3 /nest/route.h | |
| parent | 9f4908fe78cb3e5191bca721588ee1acb10876e3 (diff) | |
Backport some minor changes from int-new
Diffstat (limited to 'nest/route.h')
| -rw-r--r-- | nest/route.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nest/route.h b/nest/route.h index 383f4def..2e6ae5bf 100644 --- a/nest/route.h +++ b/nest/route.h @@ -12,10 +12,11 @@ #include "lib/lists.h" #include "lib/resource.h" #include "lib/timer.h" -#include "nest/protocol.h" +struct ea_list; struct protocol; struct proto; +struct rte_src; struct symbol; struct filter; struct cli; @@ -273,7 +274,7 @@ static inline net *net_get(rtable *tab, ip_addr addr, unsigned len) { return (ne rte *rte_find(net *net, struct rte_src *src); rte *rte_get_temp(struct rta *); void rte_update2(struct announce_hook *ah, net *net, rte *new, struct rte_src *src); -static inline void rte_update(struct proto *p, net *net, rte *new) { rte_update2(p->main_ahook, net, new, p->main_source); } +/* rte_update() moved to protocol.h to avoid dependency conflicts */ int rt_examine(rtable *t, ip_addr prefix, int pxlen, struct proto *p, struct filter *filter); rte *rt_export_merged(struct announce_hook *ah, net *net, rte **rt_free, struct ea_list **tmpa, linpool *pool, int silent); void rt_refresh_begin(rtable *t, struct announce_hook *ah); |