diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-11-08 17:03:31 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-11-08 17:04:29 +0100 |
| commit | cc5b93f72db80abd1262a0a5e1d8400ceef54385 (patch) | |
| tree | 42d75cb7898c6b6077e9cfbb04074cfc84e38930 /nest/route.h | |
| parent | 5de0e848de06a9187046dbc380d9ce6a6f8b21a2 (diff) | |
| parent | f51b1f556595108d53b9f4580bfcb96bfbc85442 (diff) | |
Merge tag 'v1.6.2' into int-new
Diffstat (limited to 'nest/route.h')
| -rw-r--r-- | nest/route.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nest/route.h b/nest/route.h index b5885ee3..a536def7 100644 --- a/nest/route.h +++ b/nest/route.h @@ -287,7 +287,7 @@ void rte_update2(struct channel *c, net_addr *n, rte *new, struct rte_src *src); /* rte_update() moved to protocol.h to avoid dependency conflicts */ void rte_discard(rtable *tab, rte *old); int rt_examine(rtable *t, net_addr *a, struct proto *p, struct filter *filter); -rte *rt_export_merged(struct channel *c, net *net, rte **rt_free, struct ea_list **tmpa, int silent); +rte *rt_export_merged(struct channel *c, net *net, rte **rt_free, struct ea_list **tmpa, linpool *pool, int silent); void rt_refresh_begin(rtable *t, struct channel *c); void rt_refresh_end(rtable *t, struct channel *c); void rt_schedule_prune(rtable *t); @@ -509,6 +509,8 @@ int mpnh__same(struct mpnh *x, struct mpnh *y); /* Compare multipath nexthops */ static inline int mpnh_same(struct mpnh *x, struct mpnh *y) { return (x == y) || mpnh__same(x, y); } struct mpnh *mpnh_merge(struct mpnh *x, struct mpnh *y, int rx, int ry, int max, linpool *lp); +void mpnh_insert(struct mpnh **n, struct mpnh *y); +int mpnh_is_sorted(struct mpnh *x); void rta_init(void); rta *rta_lookup(rta *); /* Get rta equivalent to this one, uc++ */ |