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

Split route data structure to storage (ro) / manipulation (rw) structures.

Browse Source 
This should help a lot with keeping the route machinery and allocations
clean. This commit also changes behaviour of rte_update() with cached
rta. Newly, calling rte_update() keeps the number of rta references.
This commit is contained in:
Maria Matejka 2020-04-11 00:35:52 +02:00 committed by Maria Matejka
parent 0c0253a3a9
commit a861727d98
28 changed files with 893 additions and 984 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
filter/f-inst.c
View File

@ -494,14 +494,14 @@
{ {
STATIC_ATTR; STATIC_ATTR;
ACCESS_RTE; ACCESS_RTE;
struct rta *rta = (*fs->rte)->attrs; struct rta *rta = fs->rte->attrs;
switch (sa.sa_code) switch (sa.sa_code)
{ {
case SA_FROM: RESULT(sa.f_type, ip, rta->from); break; case SA_FROM: RESULT(sa.f_type, ip, rta->from); break;
case SA_GW: RESULT(sa.f_type, ip, rta->nh.gw); break; case SA_GW: RESULT(sa.f_type, ip, rta->nh.gw); break;
case SA_NET: RESULT(sa.f_type, net, (*fs->rte)->net->n.addr); break; case SA_NET: RESULT(sa.f_type, net, fs->rte->net); break;
case SA_PROTO: RESULT(sa.f_type, s, (*fs->rte)->src->proto->name); break; case SA_PROTO: RESULT(sa.f_type, s, fs->rte->src->proto->name); break;
case SA_SOURCE: RESULT(sa.f_type, i, rta->source); break; case SA_SOURCE: RESULT(sa.f_type, i, rta->source); break;
case SA_SCOPE: RESULT(sa.f_type, i, rta->scope); break; case SA_SCOPE: RESULT(sa.f_type, i, rta->scope); break;
case SA_DEST: RESULT(sa.f_type, i, rta->dest); break; case SA_DEST: RESULT(sa.f_type, i, rta->dest); break;
@ -523,7 +523,7 @@
f_rta_cow(fs); f_rta_cow(fs);
{ {
struct rta *rta = (*fs->rte)->attrs; struct rta *rta = fs->rte->attrs;
switch (sa.sa_code) switch (sa.sa_code)
{ {
@ -534,7 +534,7 @@
case SA_GW: case SA_GW:
{ {
ip_addr ip = v1.val.ip; ip_addr ip = v1.val.ip;
neighbor *n = neigh_find((*fs->rte)->src->proto, ip, NULL, 0); neighbor *n = neigh_find(fs->rte->src->proto, ip, NULL, 0);
if (!n || (n->scope == SCOPE_HOST)) if (!n || (n->scope == SCOPE_HOST))
runtime( "Invalid gw address" ); runtime( "Invalid gw address" );
@ -1146,7 +1146,7 @@
struct rtable *table = rtc->table; struct rtable *table = rtc->table;
ACCESS_RTE; ACCESS_RTE;
ACCESS_EATTRS; ACCESS_EATTRS;
const net_addr *net = (*fs->rte)->net->n.addr; const net_addr *net = fs->rte->net;
/* We ignore temporary attributes, probably not a problem here */ /* We ignore temporary attributes, probably not a problem here */
/* 0x02 is a value of BA_AS_PATH, we don't want to include BGP headers */ /* 0x02 is a value of BA_AS_PATH, we don't want to include BGP headers */

85
filter/filter.c
View File

@ -76,10 +76,7 @@ struct filter_state {
struct filter_stack *stack; struct filter_stack *stack;
/* The route we are processing. This may be NULL to indicate no route available. */ /* The route we are processing. This may be NULL to indicate no route available. */
struct rte **rte; struct rte *rte;
/* The old rta to be freed after filters are done. */
struct rta *old_rta;
/* Cached pointer to ea_list */ /* Cached pointer to ea_list */
struct ea_list **eattrs; struct ea_list **eattrs;
@ -87,11 +84,11 @@ struct filter_state {
/* Linpool for adata allocation */ /* Linpool for adata allocation */
struct linpool *pool; struct linpool *pool;
/* Buffer for log output */
struct buffer buf;
/* Filter execution flags */ /* Filter execution flags */
int flags; int flags;
/* Buffer for log output */
struct buffer buf;
}; };
_Thread_local static struct filter_state filter_state; _Thread_local static struct filter_state filter_state;
@ -101,15 +98,7 @@ void (*bt_assert_hook)(int result, const struct f_line_item *assert);
static inline void f_cache_eattrs(struct filter_state *fs) static inline void f_cache_eattrs(struct filter_state *fs)
{ {
fs->eattrs = &((*fs->rte)->attrs->eattrs); fs->eattrs = &(fs->rte->attrs->eattrs);
}
static inline void f_rte_cow(struct filter_state *fs)
{
if (!((*fs->rte)->flags & REF_COW))
return;
*fs->rte = rte_cow(*fs->rte);
} }
/* /*
@ -118,22 +107,16 @@ static inline void f_rte_cow(struct filter_state *fs)
static void static void
f_rta_cow(struct filter_state *fs) f_rta_cow(struct filter_state *fs)
{ {
if (!rta_is_cached((*fs->rte)->attrs)) if (!rta_is_cached(fs->rte->attrs))
return; return;
/* Prepare to modify rte */
f_rte_cow(fs);
/* Store old rta to free it later, it stores reference from rte_cow() */
fs->old_rta = (*fs->rte)->attrs;
/* /*
* Get shallow copy of rta. Fields eattrs and nexthops of rta are shared * Get shallow copy of rta. Fields eattrs and nexthops of rta are shared
* with fs->old_rta (they will be copied when the cached rta will be obtained * with fs->old_rta (they will be copied when the cached rta will be obtained
* at the end of f_run()), also the lock of hostentry is inherited (we * at the end of f_run()), also the lock of hostentry is inherited (we
* suppose hostentry is not changed by filters). * suppose hostentry is not changed by filters).
*/ */
(*fs->rte)->attrs = rta_do_cow((*fs->rte)->attrs, fs->pool); fs->rte->attrs = rta_do_cow(fs->rte->attrs, fs->pool);
/* Re-cache the ea_list */ /* Re-cache the ea_list */
f_cache_eattrs(fs); f_cache_eattrs(fs);
@ -241,29 +224,15 @@ interpret(struct filter_state *fs, const struct f_line *line, struct f_val *val)
/** /**
* f_run - run a filter for a route * f_run - run a filter for a route
* @filter: filter to run * @filter: filter to run
* @rte: route being filtered, may be modified * @rte: route being filtered; must be writable
* @tmp_pool: all filter allocations go from this pool * @tmp_pool: all filter allocations go from this pool
* @flags: flags * @flags: flags
* *
* If filter needs to modify the route, there are several * If filter needs to modify the attributes, it allocates a local
* posibilities. @rte might be read-only (with REF_COW flag), in that * shallow copy of them on @tmp_pool.
* case rw copy is obtained by rte_cow() and @rte is replaced. If
* @rte is originally rw, it may be directly modified (and it is never
* copied).
*
* The returned rte may reuse the (possibly cached, cloned) rta, or
* (if rta was modified) contains a modified uncached rta, which
* uses parts allocated from @tmp_pool and parts shared from original
* rta. There is one exception - if @rte is rw but contains a cached
* rta and that is modified, rta in returned rte is also cached.
*
* Ownership of cached rtas is consistent with rte, i.e.
* if a new rte is returned, it has its own clone of cached rta
* (and cached rta of read-only source rte is intact), if rte is
* modified in place, old cached rta is possibly freed.
*/ */
enum filter_return enum filter_return
f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags) f_run(const struct filter *filter, struct rte *rte, struct linpool *tmp_pool, int flags)
{ {
if (filter == FILTER_ACCEPT) if (filter == FILTER_ACCEPT)
return F_ACCEPT; return F_ACCEPT;
@ -271,7 +240,6 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
if (filter == FILTER_REJECT) if (filter == FILTER_REJECT)
return F_REJECT; return F_REJECT;
int rte_cow = ((*rte)->flags & REF_COW);
DBG( "Running filter `%s'...", filter->name ); DBG( "Running filter `%s'...", filter->name );
/* Initialize the filter state */ /* Initialize the filter state */
@ -287,32 +255,6 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
/* Run the interpreter itself */ /* Run the interpreter itself */
enum filter_return fret = interpret(&filter_state, filter->root, NULL); enum filter_return fret = interpret(&filter_state, filter->root, NULL);
if (filter_state.old_rta) {
/*
* Cached rta was modified and filter_state->rte contains now an uncached one,
* sharing some part with the cached one. The cached rta should
* be freed (if rte was originally COW, filter_state->old_rta is a clone
* obtained during rte_cow()).
*
* This also implements the exception mentioned in f_run()
* description. The reason for this is that rta reuses parts of
* filter_state->old_rta, and these may be freed during rta_free(filter_state->old_rta).
* This is not the problem if rte was COW, because original rte
* also holds the same rta.
*/
if (!rte_cow) {
/* Cache the new attrs */
(*filter_state.rte)->attrs = rta_lookup((*filter_state.rte)->attrs);
/* Drop cached ea_list pointer */
filter_state.eattrs = NULL;
}
/* Uncache the old attrs and drop the pointer as it is invalid now. */
rta_free(filter_state.old_rta);
filter_state.old_rta = NULL;
}
/* Process the filter output, log it and return */ /* Process the filter output, log it and return */
if (fret < F_ACCEPT) { if (fret < F_ACCEPT) {
if (!(filter_state.flags & FF_SILENT)) if (!(filter_state.flags & FF_SILENT))
@ -337,7 +279,7 @@ f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, i
*/ */
enum filter_return enum filter_return
f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool) f_eval_rte(const struct f_line *expr, struct rte *rte, struct linpool *tmp_pool)
{ {
filter_state = (struct filter_state) { filter_state = (struct filter_state) {
.stack = &filter_stack, .stack = &filter_stack,
@ -347,8 +289,7 @@ f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool
LOG_BUFFER_INIT(filter_state.buf); LOG_BUFFER_INIT(filter_state.buf);
ASSERT(!((*rte)->flags & REF_COW)); ASSERT(!rta_is_cached(rte->attrs));
ASSERT(!rta_is_cached((*rte)->attrs));
return interpret(&filter_state, expr, NULL); return interpret(&filter_state, expr, NULL);
} }

4
filter/filter.h
View File

@ -53,8 +53,8 @@ struct filter {
struct rte; struct rte;
enum filter_return f_run(const struct filter *filter, struct rte **rte, struct linpool *tmp_pool, int flags); enum filter_return f_run(const struct filter *filter, struct rte *rte, struct linpool *tmp_pool, int flags);
enum filter_return f_eval_rte(const struct f_line *expr, struct rte **rte, struct linpool *tmp_pool); enum filter_return f_eval_rte(const struct f_line *expr, struct rte *rte, struct linpool *tmp_pool);
uint f_eval_int(const struct f_line *expr); uint f_eval_int(const struct f_line *expr);
enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf); enum filter_return f_eval_buf(const struct f_line *expr, struct linpool *tmp_pool, buffer *buf);

2
lib/birdlib.h
View File

@ -72,7 +72,7 @@ static inline int u64_cmp(u64 i1, u64 i2)
#define NORET __attribute__((noreturn)) #define NORET __attribute__((noreturn))
#define UNUSED __attribute__((unused)) #define UNUSED __attribute__((unused))
#define PACKED __attribute__((packed)) #define PACKED __attribute__((packed))
#define NONNULL(x) __attribute__((nonnull((x)))) #define NONNULL(...) __attribute__((nonnull (__VA_ARGS__)))
#define USE_RESULT __attribute__((warn_unused_result)) #define USE_RESULT __attribute__((warn_unused_result))
#ifndef HAVE_THREAD_LOCAL #ifndef HAVE_THREAD_LOCAL

2
nest/proto.c
View File

@ -704,8 +704,8 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
c->out_limit = cf->out_limit; c->out_limit = cf->out_limit;
// c->ra_mode = cf->ra_mode; // c->ra_mode = cf->ra_mode;
c->merge_limit = cf->merge_limit;
c->preference = cf->preference; c->preference = cf->preference;
c->merge_limit = cf->merge_limit;
c->in_keep_filtered = cf->in_keep_filtered; c->in_keep_filtered = cf->in_keep_filtered;
channel_verify_limits(c); channel_verify_limits(c);

18
nest/protocol.h
View File

@ -78,7 +78,7 @@ struct protocol {
int (*shutdown)(struct proto *); /* Stop the instance */ int (*shutdown)(struct proto *); /* Stop the instance */
void (*cleanup)(struct proto *); /* Called after shutdown when protocol became hungry/down */ void (*cleanup)(struct proto *); /* Called after shutdown when protocol became hungry/down */
void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */ void (*get_status)(struct proto *, byte *buf); /* Get instance status (for `show protocols' command) */
void (*get_route_info)(struct rte *, byte *buf); /* Get route information (for `show route' command) */ void (*get_route_info)(struct rte *, struct rte_storage *, byte *); /* Get route information (for `show route' command) */
int (*get_attr)(const struct eattr *, byte *buf, int buflen); /* ASCIIfy dynamic attribute (returns GA_*) */ int (*get_attr)(const struct eattr *, byte *buf, int buflen); /* ASCIIfy dynamic attribute (returns GA_*) */
void (*show_proto_info)(struct proto *); /* Show protocol info (for `show protocols all' command) */ void (*show_proto_info)(struct proto *); /* Show protocol info (for `show protocols all' command) */
void (*copy_config)(struct proto_config *, struct proto_config *); /* Copy config from given protocol instance */ void (*copy_config)(struct proto_config *, struct proto_config *); /* Copy config from given protocol instance */
@ -213,7 +213,7 @@ struct proto {
void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a); void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
void (*rt_notify)(struct channel *, struct rte_export *); void (*rt_notify)(struct channel *, struct rte_export *);
void (*neigh_notify)(struct neighbor *neigh); void (*neigh_notify)(struct neighbor *neigh);
int (*preexport)(struct proto *, struct rte *rt); int (*preexport)(struct channel *, struct rte *rt);
void (*reload_routes)(struct channel *); void (*reload_routes)(struct channel *);
void (*feed_begin)(struct channel *, int initial); void (*feed_begin)(struct channel *, int initial);
void (*feed_end)(struct channel *); void (*feed_end)(struct channel *);
@ -228,12 +228,12 @@ struct proto {
* rte_remove Called whenever a rte is removed from the routing table. * rte_remove Called whenever a rte is removed from the routing table.
*/ */
int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *); int (*rte_recalculate)(struct rtable *, struct network *, struct rte_storage *, struct rte_storage *, struct rte_storage *);
int (*rte_better)(struct rte *, struct rte *); int (*rte_better)(struct rte_storage *, struct rte_storage *);
int (*rte_mergable)(struct rte *, struct rte *); int (*rte_mergable)(struct rte_storage *, struct rte_storage *);
struct rte * (*rte_modify)(struct rte *, struct linpool *); struct rta *(*rte_modify)(struct rte_storage *, struct linpool *);
void (*rte_insert)(struct network *, struct rte *); void (*rte_insert)(struct network *, struct rte_storage *);
void (*rte_remove)(struct network *, struct rte *); void (*rte_remove)(struct network *, struct rte_storage *);
/* Hic sunt protocol-specific data */ /* Hic sunt protocol-specific data */
}; };
@ -534,7 +534,7 @@ struct channel {
struct rtable *in_table; /* Internal table for received routes */ struct rtable *in_table; /* Internal table for received routes */
struct event *reload_event; /* Event responsible for reloading from in_table */ struct event *reload_event; /* Event responsible for reloading from in_table */
struct fib_iterator reload_fit; /* FIB iterator in in_table used during reloading */ struct fib_iterator reload_fit; /* FIB iterator in in_table used during reloading */
struct rte *reload_next_rte; /* Route iterator in in_table used during reloading */ struct rte_storage *reload_next_rte; /* Route iterator in in_table used during reloading */
u8 reload_active; /* Iterator reload_fit is linked */ u8 reload_active; /* Iterator reload_fit is linked */
list net_feed; /* Active net feeders (struct channel_net_feed) */ list net_feed; /* Active net feeders (struct channel_net_feed) */

115
nest/route.h
View File

@ -181,7 +181,7 @@ typedef struct rtable {
#define NHU_DIRTY 3 #define NHU_DIRTY 3
typedef struct network { typedef struct network {
struct rte *routes; /* Available routes for this network */ struct rte_storage *routes; /* Available routes for this network */
struct fib_node n; /* FIB flags reserved for kernel syncer */ struct fib_node n; /* FIB flags reserved for kernel syncer */
} net; } net;
@ -213,40 +213,64 @@ struct hostentry {
}; };
typedef struct rte { typedef struct rte {
struct rte *next; struct rta *attrs; /* Attributes of this route */
const net_addr *net; /* Network this RTE belongs to */
struct rte_src *src; /* Route source that created the route */
} rte;
struct rte_storage {
struct rte_storage *next; /* Next in chain */
struct rta *attrs; /* Attributes of this route */
net *net; /* Network this RTE belongs to */ net *net; /* Network this RTE belongs to */
struct rte_src *src; /* Route source that created the route */ struct rte_src *src; /* Route source that created the route */
struct channel *sender; /* Channel used to send the route to the routing table */ struct channel *sender; /* Channel used to send the route to the routing table */
struct rta *attrs; /* Attributes of this route */
u32 id; /* Table specific route id */ u32 id; /* Table specific route id */
byte flags; /* Flags (REF_...) */ byte flags; /* Flags (REF_...) */
byte pflags; /* Protocol-specific flags */ byte pflags; /* Protocol-specific flags */
btime lastmod; /* Last modified */ btime lastmod; /* Last modified */
} rte;
/* Route export structure. Protocols get this structure as an information about
* new routes on the channel. */
struct rte_export {
net_addr *net; /* Network information */
rte *new; /* New route (NULL for withdraw) */
struct rte_src *new_src; /* New route src (kept if route is rejected by preexport or filter) */
rte *old; /* Old route (only if export table is on) */
struct rte_src *old_src; /* Old route src */
}; };
#define REF_COW 1 /* Copy this rte on write */
#define REF_FILTERED 2 /* Route is rejected by import filter */ #define REF_FILTERED 2 /* Route is rejected by import filter */
#define REF_STALE 4 /* Route is stale in a refresh cycle */ #define REF_STALE 4 /* Route is stale in a refresh cycle */
#define REF_DISCARD 8 /* Route is scheduled for discard */ #define REF_DISCARD 8 /* Route is scheduled for discard */
#define REF_MODIFY 16 /* Route is scheduled for modify */ #define REF_MODIFY 16 /* Route is scheduled for modify */
/* Route is valid for propagation (may depend on other flags in the future), accepts NULL */ /* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); } static inline int rte_is_valid(const struct rte_storage *r) { return r && !(r->flags & REF_FILTERED); }
/* Route just has REF_FILTERED flag */ /* Route just has REF_FILTERED flag */
static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED); } static inline int rte_is_filtered(const struct rte_storage *r) { return !!(r->flags & REF_FILTERED); }
/* Route export structure. Protocols get this structure as an information about
* new routes on the channel.
*
* In new:
* if all fields are set then the route is to be exported,
* if all fields are set but attrs == NULL then this route has been filtered out,
* if all fields are NULL then there is no route at all to announce.
*
* In old:
* if all fields are set then this is the complete previously exported route,
* if all fields are set but attrs == NULL then this route was exported last time
* but we don't run filters on it once more to get the modified version,
* if all fields are NULL then there was no route at all to withdraw.
*/
struct rte_export {
rte new; /* New route */
rte old; /* Old route */
u32 new_id, old_id; /* Table specific route id for channel-private use */
};
static inline enum rte_export_kind {
REX_NOTHING = 0,
REX_ANNOUNCEMENT = 1,
REX_WITHDRAWAL = 2,
REX_UPDATE = 3,
} PACKED rte_export_kind(struct rte_export *ep)
{ return ((ep->new.attrs) ? REX_ANNOUNCEMENT : 0) | ((ep->old.net) ? REX_WITHDRAWAL : 0); }
/* Types of route announcement, also used as flags */ /* Types of route announcement, also used as flags */
#define RA_UNDEF 0 /* Undefined RA type */ #define RA_UNDEF 0 /* Undefined RA type */
@ -264,19 +288,18 @@ static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED);
/** /**
* rte_update - enter a new update to a routing table * rte_update - enter a new update to a routing table
* @c: channel doing the update * @c: channel doing the update
* @net: network address
* @rte: a &rte representing the new route * @rte: a &rte representing the new route
* *
* This function imports a new route to the appropriate table (via the channel). * This function imports a new route to the appropriate table (via the channel).
* Table keys are @net (obligatory) and @rte->attrs->src. * Table keys are @rte->net (obligatory) and @rte->src.
* Both the @net and @rte pointers can be local. * The @rte pointer can be local as well as @rte->net. The @rte->src must be
* either the protocol's main_source, or looked-up by rt_get_source().
* The @rte pointer must be writable.
* *
* The route attributes (@rte->attrs) are obligatory. They can be also allocated * For an update, the route attributes (@rte->attrs) are obligatory.
* locally. Anyway, if you use an already-cached attribute object, you shall * They can be also allocated locally. If you use an already-cached
* call rta_clone() on that object yourself. (This semantics may change in future.) * attribute object, this function returns keeping your reference
* * for yourself. No attributes means withdraw.
* If the route attributes are local, you may set @rte->attrs->src to NULL, then
* the protocol's default route source will be supplied.
* *
* When rte_update() gets a route, it automatically validates it. This includes * When rte_update() gets a route, it automatically validates it. This includes
* checking for validity of the given network and next hop addresses and also * checking for validity of the given network and next hop addresses and also
@ -290,21 +313,11 @@ static inline int rte_is_filtered(rte *r) { return !!(r->flags & REF_FILTERED);
* All memory used for temporary allocations is taken from a special linpool * All memory used for temporary allocations is taken from a special linpool
* @rte_update_pool and freed when rte_update() finishes. * @rte_update_pool and freed when rte_update() finishes.
*/ */
void rte_update(struct channel *c, const net_addr *net, struct rte *rte); void rte_update(struct channel *c, struct rte *rte) NONNULL(1,2);
static inline void rte_withdraw(struct channel *c, const net_addr *net, struct rte_src *src)
/** {
* rte_withdraw - withdraw a route from a routing table rte e = { .net = net, .src = src}; rte_update(c, &e);
* @c: channel doing the withdraw }
* @net: network address
* @src: the route source identifier
*
* This function withdraws a previously announced route from the table.
* No import filter is called. This function is idempotent. If no route
* is found under the given key, it does nothing.
*
* If @src is NULL, the protocol's default route source is used.
*/
void rte_withdraw(struct channel *c, const net_addr *net, struct rte_src *src);
extern list routing_tables; extern list routing_tables;
struct config; struct config;
@ -321,18 +334,18 @@ static inline net *net_find_valid(rtable *tab, const net_addr *addr)
static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); } static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
void *net_route(rtable *tab, const net_addr *n); void *net_route(rtable *tab, const net_addr *n);
int net_roa_check(rtable *tab, const net_addr *n, u32 asn); int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
rte *rte_find(net *net, struct rte_src *src); struct rte_storage *rte_find(net *net, struct rte_src *src);
rte *rt_export_merged(struct channel *c, net *net, rte **rt_free, linpool *pool, int silent); _Bool rt_export_merged(struct channel *c, net *net, rte *best, linpool *pool, int silent);
void rt_refresh_begin(rtable *t, struct channel *c); void rt_refresh_begin(rtable *t, struct channel *c);
void rt_refresh_end(rtable *t, struct channel *c); void rt_refresh_end(rtable *t, struct channel *c);
void rt_modify_stale(rtable *t, struct channel *c); void rt_modify_stale(rtable *t, struct channel *c);
void rt_schedule_prune(rtable *t); void rt_schedule_prune(rtable *t);
void rte_dump(rte *); void rte_dump(struct rte_storage *);
void rte_free(rte *); void rte_free(struct rte_storage *);
rte *rte_do_cow(rte *); struct rte_storage *rte_store(const rte *, net *n);
rte *rte_store(rte *); void rte_copy_metadata(struct rte_storage *dest, struct rte_storage *src);
static inline rte * rte_cow(rte *r) { return (r->flags & REF_COW) ? rte_do_cow(r) : r; } static inline rte rte_copy(const struct rte_storage *r)
rte *rte_cow_rta(rte *r, linpool *lp); { return (rte) { .attrs = r->attrs, .net = r->net->n.addr, .src = r->src }; }
void rt_dump(rtable *); void rt_dump(rtable *);
void rt_dump_all(void); void rt_dump_all(void);
int rt_feed_channel(struct channel *c); int rt_feed_channel(struct channel *c);
@ -341,7 +354,7 @@ void rt_feed_channel_abort(struct channel *c);
int rt_reload_channel(struct channel *c); int rt_reload_channel(struct channel *c);
void rt_reload_channel_abort(struct channel *c); void rt_reload_channel_abort(struct channel *c);
void rt_prune_sync(rtable *t, int all); void rt_prune_sync(rtable *t, int all);
int rte_update_out(struct channel *c, const net_addr *n, struct rte_src *src, rte *new, rte **old_exported, int refeed); int rte_update_out(struct channel *c, rte *new, rte *old, struct rte_storage **old_stored, int refeed);
struct rtable_config *rt_new_table(struct symbol *s, uint addr_type); struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
@ -662,7 +675,7 @@ void rta_dump(rta *);
void rta_dump_all(void); void rta_dump_all(void);
void rta_show(struct cli *, rta *); void rta_show(struct cli *, rta *);
u32 rt_get_igp_metric(rte *rt); u32 rt_get_igp_metric(struct rta *);
struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep); struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls); void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);

3
nest/rt-dev.c
View File

@ -85,9 +85,10 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
}; };
rte e0 = { rte e0 = {
.src = rt_get_source(P, ad->iface->index), .src = rt_get_source(P, ad->iface->index),
.net = net,
.attrs = &a0, .attrs = &a0,
}; };
rte_update(c, net, &e0); rte_update(c, &e0);
} }
} }

39
nest/rt-show.c
View File

@ -37,16 +37,16 @@ rt_show_get_kernel(struct rt_show_data *d)
} }
static void static void
rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary) rt_show_rte(struct cli *c, byte *ia, struct rte *e, struct rte_storage *er, struct rt_show_data *d)
{ {
byte from[IPA_MAX_TEXT_LENGTH+8]; byte from[IPA_MAX_TEXT_LENGTH+8];
byte tm[TM_DATETIME_BUFFER_SIZE], info[256]; byte tm[TM_DATETIME_BUFFER_SIZE], info[256];
rta *a = e->attrs; rta *a = e->attrs;
int sync_error = d->kernel ? krt_get_sync_error(d->kernel, e) : 0; int sync_error = d->kernel ? krt_get_sync_error(d->kernel, er->id) : 0;
void (*get_route_info)(struct rte *, byte *buf); void (*get_route_info)(struct rte *, struct rte_storage *, byte *);
struct nexthop *nh; struct nexthop *nh;
tm_format_time(tm, &config->tf_route, e->lastmod); tm_format_time(tm, &config->tf_route, er->lastmod);
if (ipa_nonzero(a->from) && !ipa_equal(a->from, a->nh.gw)) if (ipa_nonzero(a->from) && !ipa_equal(a->from, a->nh.gw))
bsprintf(from, " from %I", a->from); bsprintf(from, " from %I", a->from);
else else
@ -58,7 +58,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
get_route_info = e->src->proto->proto->get_route_info; get_route_info = e->src->proto->proto->get_route_info;
if (get_route_info) if (get_route_info)
get_route_info(e, info); get_route_info(e, er, info);
else else
bsprintf(info, " (%d)", a->pref); bsprintf(info, " (%d)", a->pref);
@ -66,7 +66,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
rt_show_table(c, d); rt_show_table(c, d);
cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest), cli_printf(c, -1007, "%-20s %s [%s %s%s]%s%s", ia, rta_dest_name(a->dest),
e->src->proto->name, tm, from, primary ? (sync_error ? " !" : " *") : "", info); e->src->proto->name, tm, from, (er == er->net->routes) ? (sync_error ? " !" : " *") : "", info);
if (a->dest == RTD_UNICAST) if (a->dest == RTD_UNICAST)
for (nh = &(a->nh); nh; nh = nh->next) for (nh = &(a->nh); nh; nh = nh->next)
@ -101,7 +101,6 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary
static void static void
rt_show_net(struct cli *c, net *n, struct rt_show_data *d) rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
{ {
rte *e, *ee;
byte ia[NET_MAX_TEXT_LENGTH+1]; byte ia[NET_MAX_TEXT_LENGTH+1];
struct channel *ec = d->tab->export_channel; struct channel *ec = d->tab->export_channel;
@ -115,9 +114,9 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
bsnprintf(ia, sizeof(ia), "%N", n->n.addr); bsnprintf(ia, sizeof(ia), "%N", n->n.addr);
for (e = n->routes; e; e = e->next) for (struct rte_storage *er = n->routes; er; er = er->next)
{ {
if (rte_is_filtered(e) != d->filtered) if (rte_is_filtered(er) != d->filtered)
continue; continue;
d->rt_counter++; d->rt_counter++;
@ -127,7 +126,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
if (pass) if (pass)
continue; continue;
ee = e; struct rte e = rte_copy(er);
/* Export channel is down, do not try to export routes to it */ /* Export channel is down, do not try to export routes to it */
if (ec && (ec->export_state == ES_DOWN)) if (ec && (ec->export_state == ES_DOWN))
@ -135,7 +134,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
if (d->export_mode == RSEM_EXPORTED) if (d->export_mode == RSEM_EXPORTED)
{ {
if (!bmap_test(&ec->export_map, ee->id)) if (!bmap_test(&ec->export_map, er->id))
goto skip; goto skip;
// if (ec->ra_mode != RA_ANY) // if (ec->ra_mode != RA_ANY)
@ -144,17 +143,14 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
else if ((d->export_mode == RSEM_EXPORT) && (ec->ra_mode == RA_MERGED)) else if ((d->export_mode == RSEM_EXPORT) && (ec->ra_mode == RA_MERGED))
{ {
/* Special case for merged export */ /* Special case for merged export */
rte *rt_free;
e = rt_export_merged(ec, n, &rt_free, c->show_pool, 1);
pass = 1; pass = 1;
if (!rt_export_merged(ec, n, &e, c->show_pool, 1))
if (!e) goto skip;
{ e = ee; goto skip; }
} }
else if (d->export_mode) else if (d->export_mode)
{ {
struct proto *ep = ec->proto; struct proto *ep = ec->proto;
int ic = ep->preexport ? ep->preexport(ep, e) : 0; int ic = ep->preexport ? ep->preexport(ec, &e) : 0;
if (ec->ra_mode == RA_OPTIMAL || ec->ra_mode == RA_MERGED) if (ec->ra_mode == RA_OPTIMAL || ec->ra_mode == RA_MERGED)
pass = 1; pass = 1;
@ -180,24 +176,19 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
} }
} }
if (d->show_protocol && (d->show_protocol != e->src->proto)) if (d->show_protocol && (d->show_protocol != er->src->proto))
goto skip; goto skip;
if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT) if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT)
goto skip; goto skip;
if (d->stats < 2) if (d->stats < 2)
rt_show_rte(c, ia, e, d, (e->net->routes == ee)); rt_show_rte(c, ia, &e, er, d);
d->show_counter++; d->show_counter++;
ia[0] = 0; ia[0] = 0;
skip: skip:
if (e != ee)
{
rte_free(e);
e = ee;
}
lp_flush(c->show_pool); lp_flush(c->show_pool);
if (d->primary_only) if (d->primary_only)

970
nest/rt-table.c
View File

File diff suppressed because it is too large Load Diff

34
proto/babel/babel.c
View File

@ -664,12 +664,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
}; };
rte e0 = { rte e0 = {
.net = e->n.addr,
.src = p->p.main_source, .src = p->p.main_source,
.attrs = &a0, .attrs = &a0,
}; };
e->unreachable = 0; e->unreachable = 0;
rte_update(c, e->n.addr, &e0); rte_update(c, &e0);
} }
else if (e->valid && (e->router_id != p->router_id)) else if (e->valid && (e->router_id != p->router_id))
{ {
@ -682,12 +683,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
}; };
rte e0 = { rte e0 = {
.net = e->n.addr,
.src = p->p.main_source, .src = p->p.main_source,
.attrs = &a0, .attrs = &a0,
}; };
e->unreachable = 1; e->unreachable = 1;
rte_update(c, e->n.addr, &e0); rte_update(c, &e0);
} }
else else
{ {
@ -1866,12 +1868,12 @@ babel_dump(struct proto *P)
} }
static void static void
babel_get_route_info(rte *rte, byte *buf) babel_get_route_info(struct rte *e, struct rte_storage *er UNUSED, byte *buf)
{ {
u64 rid; u64 rid;
memcpy(&rid, ea_find(rte->attrs->eattrs, EA_BABEL_ROUTER_ID)->u.ptr->data, sizeof(u64)); memcpy(&rid, ea_find(e->attrs->eattrs, EA_BABEL_ROUTER_ID)->u.ptr->data, sizeof(u64));
buf += bsprintf(buf, " (%d/%d) [%lR]", rte->attrs->pref, buf += bsprintf(buf, " (%d/%d) [%lR]", e->attrs->pref,
ea_find(rte->attrs->eattrs, EA_BABEL_METRIC)->u.data, rid); ea_find(e->attrs->eattrs, EA_BABEL_METRIC)->u.data, rid);
} }
static int static int
@ -2105,10 +2107,10 @@ babel_kick_timer(struct babel_proto *p)
static int static int
babel_preexport(struct proto *P, struct rte *new) babel_preexport(struct channel *c, struct rte *new)
{ {
/* Reject our own unreachable routes */ /* Reject our own unreachable routes */
if ((new->attrs->dest == RTD_UNREACHABLE) && (new->src->proto == P)) if ((new->attrs->dest == RTD_UNREACHABLE) && (new->src->proto == c->proto))
return -1; return -1;
return 0; return 0;
@ -2124,15 +2126,15 @@ babel_rt_notify(struct channel *c, struct rte_export *export)
struct babel_proto *p = (void *) c->proto; struct babel_proto *p = (void *) c->proto;
struct babel_entry *e; struct babel_entry *e;
if (export->new) if (export->new.attrs)
{ {
/* Update */ /* Update */
uint rt_metric = ea_get_int(export->new->attrs->eattrs, EA_BABEL_METRIC, 0); uint rt_metric = ea_get_int(export->new.attrs->eattrs, EA_BABEL_METRIC, 0);
uint rt_seqno = ea_get_int(export->new->attrs->eattrs, EA_BABEL_SEQNO, p->update_seqno); uint rt_seqno = ea_get_int(export->new.attrs->eattrs, EA_BABEL_SEQNO, p->update_seqno);
u64 rt_router_id; u64 rt_router_id;
eattr *ea; eattr *ea;
if (ea = ea_find(export->new->attrs->eattrs, EA_BABEL_ROUTER_ID)) if (ea = ea_find(export->new.attrs->eattrs, EA_BABEL_ROUTER_ID))
memcpy(&rt_router_id, ea->u.ptr->data, sizeof(u64)); memcpy(&rt_router_id, ea->u.ptr->data, sizeof(u64));
else else
rt_router_id = p->router_id; rt_router_id = p->router_id;
@ -2140,11 +2142,11 @@ babel_rt_notify(struct channel *c, struct rte_export *export)
if (rt_metric > BABEL_INFINITY) if (rt_metric > BABEL_INFINITY)
{ {
log(L_WARN "%s: Invalid babel_metric value %u for route %N", log(L_WARN "%s: Invalid babel_metric value %u for route %N",
p->p.name, rt_metric, export->net); p->p.name, rt_metric, export->new.net);
rt_metric = BABEL_INFINITY; rt_metric = BABEL_INFINITY;
} }
e = babel_get_entry(p, export->net); e = babel_get_entry(p, export->new.net);
/* Activate triggered updates */ /* Activate triggered updates */
if ((e->valid != BABEL_ENTRY_VALID) || if ((e->valid != BABEL_ENTRY_VALID) ||
@ -2162,7 +2164,7 @@ babel_rt_notify(struct channel *c, struct rte_export *export)
else else
{ {
/* Withdraw */ /* Withdraw */
e = babel_find_entry(p, export->net); e = babel_find_entry(p, export->old.net);
if (!e || e->valid != BABEL_ENTRY_VALID) if (!e || e->valid != BABEL_ENTRY_VALID)
return; return;
@ -2176,7 +2178,7 @@ babel_rt_notify(struct channel *c, struct rte_export *export)
} }
static int static int
babel_rte_better(struct rte *new, struct rte *old) babel_rte_better(struct rte_storage *new, struct rte_storage *old)
{ {
uint new_metric = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data; uint new_metric = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data;
uint old_metric = ea_find(old->attrs->eattrs, EA_BABEL_SEQNO)->u.data; uint old_metric = ea_find(old->attrs->eattrs, EA_BABEL_SEQNO)->u.data;

117
proto/bgp/attrs.c
View File

@ -333,26 +333,26 @@ bgp_aigp_set_metric(struct linpool *pool, const struct adata *ad, u64 metric)
} }
int int
bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad) bgp_total_aigp_metric_(struct rta *a, u64 *metric, const struct adata **ad)
{ {
eattr *a = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AIGP)); eattr *ea = ea_find(a->eattrs, EA_CODE(PROTOCOL_BGP, BA_AIGP));
if (!a) if (!ea)
return 0; return 0;
const byte *b = bgp_aigp_get_tlv(a->u.ptr, BGP_AIGP_METRIC); const byte *b = bgp_aigp_get_tlv(ea->u.ptr, BGP_AIGP_METRIC);
if (!b) if (!b)
return 0; return 0;
u64 aigp = get_u64(b + 3); u64 aigp = get_u64(b + 3);
u64 step = e->attrs->igp_metric; u64 step = a->igp_metric;
if (!rte_resolvable(e) || (step >= IGP_METRIC_UNKNOWN)) if (!rta_resolvable(a) || (step >= IGP_METRIC_UNKNOWN))
step = BGP_AIGP_MAX; step = BGP_AIGP_MAX;
if (!step) if (!step)
step = 1; step = 1;
*ad = a->u.ptr; *ad = ea->u.ptr;
*metric = aigp + step; *metric = aigp + step;
if (*metric < aigp) if (*metric < aigp)
*metric = BGP_AIGP_MAX; *metric = BGP_AIGP_MAX;
@ -361,12 +361,12 @@ bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad)
} }
static inline int static inline int
bgp_init_aigp_metric(rte *e, u64 *metric, const struct adata **ad) bgp_init_aigp_metric(rta *a, u64 *metric, const struct adata **ad)
{ {
if (e->attrs->source == RTS_BGP) if (a->source == RTS_BGP)
return 0; return 0;
*metric = rt_get_igp_metric(e); *metric = rt_get_igp_metric(a);
*ad = NULL; *ad = NULL;
return *metric < IGP_METRIC_UNKNOWN; return *metric < IGP_METRIC_UNKNOWN;
} }
@ -865,7 +865,7 @@ bgp_decode_large_community(struct bgp_parse_state *s, uint code UNUSED, uint fla
static void static void
bgp_export_mpls_label_stack(struct bgp_export_state *s, eattr *a) bgp_export_mpls_label_stack(struct bgp_export_state *s, eattr *a)
{ {
net_addr *n = s->route->net->n.addr; const net_addr *n = s->route->net;
u32 *labels = (u32 *) a->u.ptr->data; u32 *labels = (u32 *) a->u.ptr->data;
uint lnum = a->u.ptr->length / 4; uint lnum = a->u.ptr->length / 4;
@ -1585,7 +1585,7 @@ bgp_free_prefix_table(struct bgp_channel *c)
} }
static struct bgp_prefix * static struct bgp_prefix *
bgp_get_prefix(struct bgp_channel *c, net_addr *net, u32 path_id) bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
{ {
u32 hash = net_hash(net) ^ u32_hash(path_id); u32 hash = net_hash(net) ^ u32_hash(path_id);
struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id, hash); struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id, hash);
@ -1630,10 +1630,10 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
*/ */
int int
bgp_preexport(struct proto *P, rte *e) bgp_preexport(struct channel *c, rte *e)
{ {
struct proto *SRC = e->src->proto; struct proto *SRC = e->src->proto;
struct bgp_proto *p = (struct bgp_proto *) P; struct bgp_proto *p = (struct bgp_proto *) (c->proto);
struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL; struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
/* Reject our routes */ /* Reject our routes */
@ -1658,11 +1658,11 @@ bgp_preexport(struct proto *P, rte *e)
} }
/* Handle well-known communities, RFC 1997 */ /* Handle well-known communities, RFC 1997 */
struct eattr *c; struct eattr *com;
if (p->cf->interpret_communities && if (p->cf->interpret_communities &&
(c = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)))) (com = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY))))
{ {
const struct adata *d = c->u.ptr; const struct adata *d = com->u.ptr;
/* Do not export anywhere */ /* Do not export anywhere */
if (int_set_contains(d, BGP_COMM_NO_ADVERTISE)) if (int_set_contains(d, BGP_COMM_NO_ADVERTISE))
@ -1742,8 +1742,8 @@ bgp_update_attrs(struct bgp_proto *p, struct bgp_channel *c, rte *e, ea_list *at
/* AIGP attribute - accumulate local metric or originate new one */ /* AIGP attribute - accumulate local metric or originate new one */
u64 metric; u64 metric;
if (s.local_next_hop && if (s.local_next_hop &&
(bgp_total_aigp_metric_(e, &metric, &ad) || (bgp_total_aigp_metric_(e->attrs, &metric, &ad) ||
(c->cf->aigp_originate && bgp_init_aigp_metric(e, &metric, &ad)))) (c->cf->aigp_originate && bgp_init_aigp_metric(e->attrs, &metric, &ad))))
{ {
ad = bgp_aigp_set_metric(pool, ad, metric); ad = bgp_aigp_set_metric(pool, ad, metric);
bgp_set_attr_ptr(&attrs, pool, BA_AIGP, 0, ad); bgp_set_attr_ptr(&attrs, pool, BA_AIGP, 0, ad);
@ -1809,23 +1809,28 @@ bgp_rt_notify(struct channel *C, struct rte_export *e)
struct bgp_prefix *px; struct bgp_prefix *px;
u32 path; u32 path;
if (e->new) const net_addr *n;
if (e->new.attrs)
{ {
struct ea_list *attrs = bgp_update_attrs(p, c, e->new, e->new->attrs->eattrs, bgp_linpool2); struct ea_list *attrs = bgp_update_attrs(p, c, &(e->new), e->new.attrs->eattrs, bgp_linpool2);
/* If attributes are invalid, we fail back to withdraw */ /* If attributes are invalid, we fail back to withdraw */
buck = attrs ? bgp_get_bucket(c, attrs) : bgp_get_withdraw_bucket(c); buck = attrs ? bgp_get_bucket(c, attrs) : bgp_get_withdraw_bucket(c);
path = e->new_src->global_id; path = e->new.src->global_id;
lp_flush(bgp_linpool2); lp_flush(bgp_linpool2);
n = e->new.net;
} }
else else
{ {
buck = bgp_get_withdraw_bucket(c); buck = bgp_get_withdraw_bucket(c);
path = e->old_src->global_id; path = e->old.src->global_id;
n = e->old.net;
} }
px = bgp_get_prefix(c, e->net, c->add_path_tx ? path : 0); px = bgp_get_prefix(c, n, c->add_path_tx ? path : 0);
add_tail(&buck->prefixes, &px->buck_node); add_tail(&buck->prefixes, &px->buck_node);
bgp_schedule_packet(p->conn, c, PKT_UPDATE); bgp_schedule_packet(p->conn, c, PKT_UPDATE);
@ -1833,7 +1838,7 @@ bgp_rt_notify(struct channel *C, struct rte_export *e)
static inline u32 static inline u32
bgp_get_neighbor(rte *r) bgp_get_neighbor(struct rte_storage *r)
{ {
eattr *e = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); eattr *e = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
u32 as; u32 as;
@ -1847,7 +1852,7 @@ bgp_get_neighbor(rte *r)
} }
static inline int static inline int
rte_stale(rte *r) rte_stale(struct rte_storage *r)
{ {
if (r->pflags & BGP_REF_STALE) if (r->pflags & BGP_REF_STALE)
return 1; return 1;
@ -1870,7 +1875,7 @@ rte_stale(rte *r)
} }
int int
bgp_rte_better(rte *new, rte *old) bgp_rte_better(struct rte_storage *new, struct rte_storage *old)
{ {
struct bgp_proto *new_bgp = (struct bgp_proto *) new->src->proto; struct bgp_proto *new_bgp = (struct bgp_proto *) new->src->proto;
struct bgp_proto *old_bgp = (struct bgp_proto *) old->src->proto; struct bgp_proto *old_bgp = (struct bgp_proto *) old->src->proto;
@ -1886,8 +1891,8 @@ bgp_rte_better(rte *new, rte *old)
return 1; return 1;
/* RFC 4271 9.1.2.1. Route resolvability test */ /* RFC 4271 9.1.2.1. Route resolvability test */
n = rte_resolvable(new); n = rta_resolvable(new->attrs);
o = rte_resolvable(old); o = rta_resolvable(old->attrs);
if (n > o) if (n > o)
return 1; return 1;
if (n < o) if (n < o)
@ -1912,8 +1917,8 @@ bgp_rte_better(rte *new, rte *old)
return 0; return 0;
/* RFC 7311 4.1 - Apply AIGP metric */ /* RFC 7311 4.1 - Apply AIGP metric */
u64 n2 = bgp_total_aigp_metric(new); u64 n2 = bgp_total_aigp_metric(new->attrs);
u64 o2 = bgp_total_aigp_metric(old); u64 o2 = bgp_total_aigp_metric(old->attrs);
if (n2 < o2) if (n2 < o2)
return 1; return 1;
if (n2 > o2) if (n2 > o2)
@ -2015,7 +2020,7 @@ bgp_rte_better(rte *new, rte *old)
int int
bgp_rte_mergable(rte *pri, rte *sec) bgp_rte_mergable(struct rte_storage *pri, struct rte_storage *sec)
{ {
struct bgp_proto *pri_bgp = (struct bgp_proto *) pri->src->proto; struct bgp_proto *pri_bgp = (struct bgp_proto *) pri->src->proto;
struct bgp_proto *sec_bgp = (struct bgp_proto *) sec->src->proto; struct bgp_proto *sec_bgp = (struct bgp_proto *) sec->src->proto;
@ -2028,7 +2033,7 @@ bgp_rte_mergable(rte *pri, rte *sec)
return 0; return 0;
/* RFC 4271 9.1.2.1. Route resolvability test */ /* RFC 4271 9.1.2.1. Route resolvability test */
if (rte_resolvable(pri) != rte_resolvable(sec)) if (rta_resolvable(pri->attrs) != rta_resolvable(sec->attrs))
return 0; return 0;
/* Start with local preferences */ /* Start with local preferences */
@ -2091,23 +2096,23 @@ bgp_rte_mergable(rte *pri, rte *sec)
static inline int static inline int
same_group(rte *r, u32 lpref, u32 lasn) same_group(struct rte_storage *r, u32 lpref, u32 lasn)
{ {
return (r->attrs->pref == lpref) && (bgp_get_neighbor(r) == lasn); return (r->attrs->pref == lpref) && (bgp_get_neighbor(r) == lasn);
} }
static inline int static inline int
use_deterministic_med(rte *r) use_deterministic_med(struct rte_storage *r)
{ {
struct proto *P = r->src->proto; struct proto *P = r->src->proto;
return (P->proto == &proto_bgp) && ((struct bgp_proto *) P)->cf->deterministic_med; return (P->proto == &proto_bgp) && ((struct bgp_proto *) P)->cf->deterministic_med;
} }
int int
bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best) bgp_rte_recalculate(rtable *table, net *net, struct rte_storage *new, struct rte_storage *old, struct rte_storage *old_best)
{ {
rte *r, *s; struct rte_storage *r, *s;
rte *key = new ? new : old; struct rte_storage *key = new ? new : old;
u32 lpref = key->attrs->pref; u32 lpref = key->attrs->pref;
u32 lasn = bgp_get_neighbor(key); u32 lasn = bgp_get_neighbor(key);
int old_suppressed = old ? !!(old->pflags & BGP_REF_SUPPRESSED) : 0; int old_suppressed = old ? !!(old->pflags & BGP_REF_SUPPRESSED) : 0;
@ -2230,25 +2235,31 @@ bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best)
return !old_suppressed; return !old_suppressed;
} }
struct rte * struct rta *
bgp_rte_modify_stale(struct rte *r, struct linpool *pool) bgp_rte_modify_stale(struct rte_storage *r, struct linpool *pool)
{ {
eattr *a = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); eattr *ea = ea_find(r->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY));
const struct adata *ad = a ? a->u.ptr : NULL; const struct adata *ad = ea ? ea->u.ptr : NULL;
uint flags = a ? a->flags : BAF_PARTIAL; uint flags = ea ? ea->flags : BAF_PARTIAL;
if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR)) if (ad && int_set_contains(ad, BGP_COMM_NO_LLGR))
return NULL; return NULL;
if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE)) if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
return r; return r->attrs;
r = rte_cow_rta(r, pool); _Thread_local static struct {
bgp_set_attr_ptr(&(r->attrs->eattrs), pool, BA_COMMUNITY, flags, rta a;
u32 labels[MPLS_MAX_LABEL_STACK];
} aloc;
struct rta *a = &(aloc.a);
memcpy(a, r->attrs, rta_size(r->attrs));
bgp_set_attr_ptr(&(a->eattrs), pool, BA_COMMUNITY, flags,
int_set_add(pool, ad, BGP_COMM_LLGR_STALE)); int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
r->pflags |= BGP_REF_STALE;
return r; return a;
} }
@ -2325,7 +2336,7 @@ bgp_get_attr(const eattr *a, byte *buf, int buflen)
} }
void void
bgp_get_route_info(rte *e, byte *buf) bgp_get_route_info(struct rte *e, struct rte_storage *er, byte *buf)
{ {
eattr *p = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); eattr *p = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
eattr *o = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); eattr *o = ea_find(e->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_ORIGIN));
@ -2333,20 +2344,20 @@ bgp_get_route_info(rte *e, byte *buf)
buf += bsprintf(buf, " (%d", e->attrs->pref); buf += bsprintf(buf, " (%d", e->attrs->pref);
if (e->pflags & BGP_REF_SUPPRESSED) if (er->pflags & BGP_REF_SUPPRESSED)
buf += bsprintf(buf, "-"); buf += bsprintf(buf, "-");
if (rte_stale(e)) if (rte_stale(er))
buf += bsprintf(buf, "s"); buf += bsprintf(buf, "s");
u64 metric = bgp_total_aigp_metric(e); u64 metric = bgp_total_aigp_metric(e->attrs);
if (metric < BGP_AIGP_MAX) if (metric < BGP_AIGP_MAX)
{ {
buf += bsprintf(buf, "/%lu", metric); buf += bsprintf(buf, "/%lu", metric);
} }
else if (e->attrs->igp_metric) else if (e->attrs->igp_metric)
{ {
if (!rte_resolvable(e)) if (!rta_resolvable(e->attrs))
buf += bsprintf(buf, "/-"); buf += bsprintf(buf, "/-");
else if (e->attrs->igp_metric >= IGP_METRIC_UNKNOWN) else if (e->attrs->igp_metric >= IGP_METRIC_UNKNOWN)
buf += bsprintf(buf, "/?"); buf += bsprintf(buf, "/?");

22
proto/bgp/bgp.h
View File

@ -515,9 +515,9 @@ struct rte_source *bgp_find_source(struct bgp_proto *p, u32 path_id);
struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id); struct rte_source *bgp_get_source(struct bgp_proto *p, u32 path_id);
static inline int static inline int
rte_resolvable(rte *rt) rta_resolvable(rta *a)
{ {
return rt->attrs->dest == RTD_UNICAST; return a->dest == RTD_UNICAST;
} }
@ -579,26 +579,26 @@ void bgp_init_prefix_table(struct bgp_channel *c);
void bgp_free_prefix_table(struct bgp_channel *c); void bgp_free_prefix_table(struct bgp_channel *c);
void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp); void bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *bp);
int bgp_rte_better(struct rte *, struct rte *); int bgp_rte_better(struct rte_storage *, struct rte_storage *);
int bgp_rte_mergable(rte *pri, rte *sec); int bgp_rte_mergable(struct rte_storage *pri, struct rte_storage *sec);
int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best); int bgp_rte_recalculate(rtable *table, net *net, struct rte_storage *new, struct rte_storage *old, struct rte_storage *old_best);
struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool); struct rta *bgp_rte_modify_stale(struct rte_storage *r, struct linpool *pool);
void bgp_rt_notify(struct channel *C, struct rte_export *e); void bgp_rt_notify(struct channel *C, struct rte_export *e);
int bgp_preexport(struct proto *, struct rte *); int bgp_preexport(struct channel *, struct rte *);
int bgp_get_attr(const struct eattr *e, byte *buf, int buflen); int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
void bgp_get_route_info(struct rte *, byte *buf); void bgp_get_route_info(struct rte *, struct rte_storage *, byte *);
int bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad); int bgp_total_aigp_metric_(rta *a, u64 *metric, const struct adata **ad);
#define BGP_AIGP_METRIC 1 #define BGP_AIGP_METRIC 1
#define BGP_AIGP_MAX U64(0xffffffffffffffff) #define BGP_AIGP_MAX U64(0xffffffffffffffff)
static inline u64 static inline u64
bgp_total_aigp_metric(rte *r) bgp_total_aigp_metric(rta *a)
{ {
u64 metric = BGP_AIGP_MAX; u64 metric = BGP_AIGP_MAX;
const struct adata *ad; const struct adata *ad;
bgp_total_aigp_metric_(r, &metric, &ad); bgp_total_aigp_metric_(a, &metric, &ad);
return metric; return metric;
} }

5
proto/bgp/packets.c
View File

@ -1315,11 +1315,12 @@ bgp_rte_update(struct bgp_parse_state *s, net_addr *n, u32 path_id, rta *a0)
} }
rte e0 = { rte e0 = {
.attrs = rta_clone(s->cached_rta), .net = n,
.src = s->last_src, .src = s->last_src,
.attrs = s->cached_rta,
}; };
rte_update(&(s->channel->c), n, &e0); rte_update(&(s->channel->c), &e0);
} }
static void static void

16
proto/mrt/mrt.c
View File

@ -418,7 +418,7 @@ mrt_rib_table_header(struct mrt_table_dump_state *s, net_addr *n)
} }
static void static void
mrt_rib_table_entry(struct mrt_table_dump_state *s, rte *r) mrt_rib_table_entry(struct mrt_table_dump_state *s, rte *r, struct rte_storage *er)
{ {
buffer *b = &s->buf; buffer *b = &s->buf;
uint peer = 0; uint peer = 0;
@ -437,7 +437,7 @@ mrt_rib_table_entry(struct mrt_table_dump_state *s, rte *r)
/* Peer Index and Originated Time */ /* Peer Index and Originated Time */
mrt_put_u16(b, peer); mrt_put_u16(b, peer);
mrt_put_u32(b, (r->lastmod + s->time_offset) TO_S); mrt_put_u32(b, (er->lastmod + s->time_offset) TO_S);
/* Path Identifier */ /* Path Identifier */
if (s->add_path) if (s->add_path)
@ -459,7 +459,7 @@ mrt_rib_table_entry(struct mrt_table_dump_state *s, rte *r)
if (alen < 0) if (alen < 0)
{ {
mrt_log(s, "Attribute list too long for %N", r->net->n.addr); mrt_log(s, "Attribute list too long for %N", r->net);
alen = 0; alen = 0;
} }
@ -483,8 +483,7 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
mrt_init_message(&s->buf, MRT_TABLE_DUMP_V2, subtype); mrt_init_message(&s->buf, MRT_TABLE_DUMP_V2, subtype);
mrt_rib_table_header(s, n->n.addr); mrt_rib_table_header(s, n->n.addr);
rte *rt, *rt0; for (struct rte_storage *rt = n->routes; rt; rt = rt->next)
for (rt0 = n->routes; rt = rt0; rt0 = rt0->next)
{ {
if (rte_is_filtered(rt)) if (rte_is_filtered(rt))
continue; continue;
@ -496,11 +495,10 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path)
continue; continue;
} }
if (f_run(s->filter, &rt, s->linpool, 0) <= F_ACCEPT) rte e = rte_copy(rt);
mrt_rib_table_entry(s, rt);
if (rt != rt0) if (f_run(s->filter, &e, s->linpool, 0) <= F_ACCEPT)
rte_free(rt); mrt_rib_table_entry(s, &e, rt);
lp_flush(s->linpool); lp_flush(s->linpool);
} }

14
proto/ospf/ospf.c
View File

@ -107,9 +107,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "ospf.h" #include "ospf.h"
static int ospf_preexport(struct proto *P, rte *new); static int ospf_preexport(struct channel *c, rte *new);
static void ospf_reload_routes(struct channel *C); static void ospf_reload_routes(struct channel *C);
static int ospf_rte_better(struct rte *new, struct rte *old); static int ospf_rte_better(struct rte_storage *new, struct rte_storage *old);
static void ospf_disp(timer *timer); static void ospf_disp(timer *timer);
@ -382,7 +382,7 @@ ospf_init(struct proto_config *CF)
/* If new is better return 1 */ /* If new is better return 1 */
static int static int
ospf_rte_better(struct rte *new, struct rte *old) ospf_rte_better(struct rte_storage *new, struct rte_storage *old)
{ {
u32 new_metric1 = ea_get_int(new->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY); u32 new_metric1 = ea_get_int(new->attrs->eattrs, EA_OSPF_METRIC1, LSINFINITY);
@ -471,13 +471,13 @@ ospf_disp(timer * timer)
* import to the filters. * import to the filters.
*/ */
static int static int
ospf_preexport(struct proto *P, rte *e) ospf_preexport(struct channel *c, rte *e)
{ {
struct ospf_proto *p = (struct ospf_proto *) P; struct ospf_proto *p = (struct ospf_proto *) (c->proto);
struct ospf_area *oa = ospf_main_area(p); struct ospf_area *oa = ospf_main_area(p);
/* Reject our own routes */ /* Reject our own routes */
if (e->src->proto == P) if (e->src->proto == c->proto)
return -1; return -1;
/* Do not export routes to stub areas */ /* Do not export routes to stub areas */
@ -552,7 +552,7 @@ ospf_get_status(struct proto *P, byte * buf)
} }
static void static void
ospf_get_route_info(rte * rte, byte * buf) ospf_get_route_info(rte * rte, struct rte_storage * er UNUSED, byte * buf)
{ {
char *type = "<bug>"; char *type = "<bug>";

5
proto/ospf/rt.c
View File

@ -2094,15 +2094,16 @@ again1:
rte e0 = { rte e0 = {
.attrs = rta_lookup(&a0), .attrs = rta_lookup(&a0),
.src = p->p.main_source, .src = p->p.main_source,
.net = nf->fn.addr,
}; };
rta_free(nf->old_rta); rta_free(nf->old_rta);
nf->old_rta = rta_clone(e0.attrs); nf->old_rta = e0.attrs;
DBG("Mod rte type %d - %N via %I on iface %s, met %d\n", DBG("Mod rte type %d - %N via %I on iface %s, met %d\n",
a0.source, nf->fn.addr, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1); a0.source, nf->fn.addr, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1);
rte_update(p->p.main_channel, nf->fn.addr, &e0); rte_update(p->p.main_channel, &e0);
} }
} }
else if (nf->old_rta) else if (nf->old_rta)

14
proto/ospf/topology.c
View File

@ -1320,9 +1320,9 @@ ospf_rt_notify(struct channel *ch, struct rte_export *e)
if ((p->areano == 1) && oa_is_nssa(HEAD(p->area_list))) if ((p->areano == 1) && oa_is_nssa(HEAD(p->area_list)))
oa = HEAD(p->area_list); oa = HEAD(p->area_list);
if (!e->new) if (!e->new.attrs)
{ {
nf = fib_find(&p->rtf, e->net); nf = fib_find(&p->rtf, e->old.net);
if (!nf || !nf->external_rte) if (!nf || !nf->external_rte)
return; return;
@ -1340,7 +1340,7 @@ ospf_rt_notify(struct channel *ch, struct rte_export *e)
ASSERT(p->asbr); ASSERT(p->asbr);
/* Get route attributes */ /* Get route attributes */
rta *a = e->new->attrs; rta *a = e->new.attrs;
eattr *m1a = ea_find(a->eattrs, EA_OSPF_METRIC1); eattr *m1a = ea_find(a->eattrs, EA_OSPF_METRIC1);
eattr *m2a = ea_find(a->eattrs, EA_OSPF_METRIC2); eattr *m2a = ea_find(a->eattrs, EA_OSPF_METRIC2);
uint m1 = m1a ? m1a->u.data : 0; uint m1 = m1a ? m1a->u.data : 0;
@ -1349,14 +1349,14 @@ ospf_rt_notify(struct channel *ch, struct rte_export *e)
if (m1 > LSINFINITY) if (m1 > LSINFINITY)
{ {
log(L_WARN "%s: Invalid ospf_metric1 value %u for route %N", log(L_WARN "%s: Invalid ospf_metric1 value %u for route %N",
p->p.name, m1, e->net); p->p.name, m1, e->new.net);
m1 = LSINFINITY; m1 = LSINFINITY;
} }
if (m2 > LSINFINITY) if (m2 > LSINFINITY)
{ {
log(L_WARN "%s: Invalid ospf_metric2 value %u for route %N", log(L_WARN "%s: Invalid ospf_metric2 value %u for route %N",
p->p.name, m2, e->net); p->p.name, m2, e->new.net);
m2 = LSINFINITY; m2 = LSINFINITY;
} }
@ -1380,12 +1380,12 @@ ospf_rt_notify(struct channel *ch, struct rte_export *e)
if (ipa_zero(fwd)) if (ipa_zero(fwd))
{ {
log(L_ERR "%s: Cannot find forwarding address for NSSA-LSA %N", log(L_ERR "%s: Cannot find forwarding address for NSSA-LSA %N",
p->p.name, e->net); p->p.name, e->new.net);
return; return;
} }
} }
nf = fib_get(&p->rtf, e->net); nf = fib_get(&p->rtf, e->new.net);
ospf_originate_ext_lsa(p, oa, nf, LSA_M_EXPORT, metric, ebit, fwd, tag, 1, p->vpn_pe); ospf_originate_ext_lsa(p, oa, nf, LSA_M_EXPORT, metric, ebit, fwd, tag, 1, p->vpn_pe);
nf->external_rte = 1; nf->external_rte = 1;
} }

6
proto/perf/perf.c
View File

@ -165,8 +165,9 @@ perf_loop(void *data)
rte e0 = { rte e0 = {
.attrs = p->data[i].a, .attrs = p->data[i].a,
.src = p->p.main_source, .src = p->p.main_source,
.net = &(p->data[i].net),
}; };
rte_update(P->main_channel, &(p->data[i].net), &e0); rte_update(P->main_channel, &e0);
} }
clock_gettime(CLOCK_MONOTONIC, &ts_update); clock_gettime(CLOCK_MONOTONIC, &ts_update);
@ -177,6 +178,9 @@ perf_loop(void *data)
clock_gettime(CLOCK_MONOTONIC, &ts_withdraw); clock_gettime(CLOCK_MONOTONIC, &ts_withdraw);
for (uint i=0; i<N; i++)
rta_free(p->data[i].a);
s64 gentime = timediff(&ts_begin, &ts_generated); s64 gentime = timediff(&ts_begin, &ts_generated);
s64 updatetime = timediff(&ts_generated, &ts_update); s64 updatetime = timediff(&ts_generated, &ts_update);
s64 withdrawtime = timediff(&ts_update, &ts_withdraw); s64 withdrawtime = timediff(&ts_update, &ts_withdraw);

34
proto/pipe/pipe.c
View File

@ -53,48 +53,54 @@ pipe_rt_notify(struct channel *src_ch, struct rte_export *export)
struct pipe_proto *p = (void *) src_ch->proto; struct pipe_proto *p = (void *) src_ch->proto;
struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri; struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri;
if (!export->new && !export->old) if (rte_export_kind(export) == REX_NOTHING)
return; return;
const net_addr *net = export->new.attrs ? export->new.net : export->old.net;
if (dst->table->pipe_busy) if (dst->table->pipe_busy)
{ {
log(L_ERR "Pipe loop detected when sending %N to table %s", log(L_ERR "Pipe loop detected when sending %N to table %s",
export->net, dst->table->name); net, dst->table->name);
return; return;
} }
if (export->new) if (export->new.attrs)
{ {
rta *a = alloca(rta_size(export->new->attrs)); rta *a = alloca(rta_size(export->new.attrs));
memcpy(a, export->new->attrs, rta_size(export->new->attrs)); memcpy(a, export->new.attrs, rta_size(export->new.attrs));
a->cached = 0; a->cached = 0;
a->uc = 0; a->uc = 0;
a->hostentry = NULL; a->hostentry = NULL;
rte e0 = { rte e0 = {
.attrs = rta_lookup(a), .attrs = a,
.src = export->new.src,
.net = net,
}; };
src_ch->table->pipe_busy = 1; src_ch->table->pipe_busy = 1;
rte_update(dst, export->net, &e0); rte_update(dst, &e0);
src_ch->table->pipe_busy = 0; src_ch->table->pipe_busy = 0;
} }
else else
{ {
src_ch->table->pipe_busy = 1; src_ch->table->pipe_busy = 1;
rte_withdraw(dst, export->net, export->old_src); rte_withdraw(dst, net, export->old.src);
src_ch->table->pipe_busy = 0; src_ch->table->pipe_busy = 0;
} }
} }
static int static int
pipe_preexport(struct proto *P, rte *e) pipe_preexport(struct channel *src_ch, rte *e UNUSED)
{ {
struct proto *pp = e->sender->proto; struct pipe_proto *p = (void *) src_ch->proto;
struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri;
if (pp == P) /* Avoid pipe loops */
return -1; /* Avoid local loops automatically */ if (dst->table->pipe_busy)
return -1;
return 0; return 0;
} }
@ -145,7 +151,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
.table = cc->table, .table = cc->table,
.out_filter = cc->out_filter, .out_filter = cc->out_filter,
.in_limit = cc->in_limit, .in_limit = cc->in_limit,
.ra_mode = RA_ANY .ra_mode = RA_ANY,
}; };
struct channel_config sec_cf = { struct channel_config sec_cf = {
@ -154,7 +160,7 @@ pipe_configure_channels(struct pipe_proto *p, struct pipe_config *cf)
.table = cf->peer, .table = cf->peer,
.out_filter = cc->in_filter, .out_filter = cc->in_filter,
.in_limit = cc->out_limit, .in_limit = cc->out_limit,
.ra_mode = RA_ANY .ra_mode = RA_ANY,
}; };
return return

27
proto/radv/radv.c
View File

@ -385,18 +385,17 @@ radv_trigger_valid(struct radv_config *cf)
} }
static inline int static inline int
radv_net_match_trigger(struct radv_config *cf, net_addr *n) radv_net_match_trigger(struct radv_config *cf, const net_addr *n)
{ {
return radv_trigger_valid(cf) && net_equal(n, &cf->trigger); return radv_trigger_valid(cf) && net_equal(n, &cf->trigger);
} }
int int
radv_preexport(struct proto *P, rte *new) radv_preexport(struct channel *c, rte *new)
{ {
// struct radv_proto *p = (struct radv_proto *) P; struct radv_config *cf = (struct radv_config *) (c->proto->cf);
struct radv_config *cf = (struct radv_config *) (P->cf);
if (radv_net_match_trigger(cf, new->net->n.addr)) if (radv_net_match_trigger(cf, new->net))
return RIC_PROCESS; return RIC_PROCESS;
if (cf->propagate_routes) if (cf->propagate_routes)
@ -413,10 +412,12 @@ radv_rt_notify(struct channel *ch, struct rte_export *e)
struct radv_route *rt; struct radv_route *rt;
eattr *ea; eattr *ea;
if (radv_net_match_trigger(cf, e->net)) const net_addr *net = e->new.attrs ? e->new.net : e->old.net;
if (radv_net_match_trigger(cf, net))
{ {
u8 old_active = p->active; u8 old_active = p->active;
p->active = !!e->new; p->active = !!e->new.attrs;
if (p->active == old_active) if (p->active == old_active)
return; return;
@ -440,15 +441,15 @@ radv_rt_notify(struct channel *ch, struct rte_export *e)
* And yes, we exclude the trigger route on purpose. * And yes, we exclude the trigger route on purpose.
*/ */
if (e->new) if (e->new.attrs)
{ {
/* Update */ /* Update */
ea = ea_find(e->new->attrs->eattrs, EA_RA_PREFERENCE); ea = ea_find(e->new.attrs->eattrs, EA_RA_PREFERENCE);
uint preference = ea ? ea->u.data : RA_PREF_MEDIUM; uint preference = ea ? ea->u.data : RA_PREF_MEDIUM;
uint preference_set = !!ea; uint preference_set = !!ea;
ea = ea_find(e->new->attrs->eattrs, EA_RA_LIFETIME); ea = ea_find(e->new.attrs->eattrs, EA_RA_LIFETIME);
uint lifetime = ea ? ea->u.data : 0; uint lifetime = ea ? ea->u.data : 0;
uint lifetime_set = !!ea; uint lifetime_set = !!ea;
@ -457,14 +458,14 @@ radv_rt_notify(struct channel *ch, struct rte_export *e)
(preference != RA_PREF_HIGH)) (preference != RA_PREF_HIGH))
{ {
log(L_WARN "%s: Invalid ra_preference value %u on route %N", log(L_WARN "%s: Invalid ra_preference value %u on route %N",
p->p.name, preference, e->net); p->p.name, preference, e->new.net);
preference = RA_PREF_MEDIUM; preference = RA_PREF_MEDIUM;
preference_set = 1; preference_set = 1;
lifetime = 0; lifetime = 0;
lifetime_set = 1; lifetime_set = 1;
} }
rt = fib_get(&p->routes, e->net); rt = fib_get(&p->routes, e->new.net);
/* Ignore update if nothing changed */ /* Ignore update if nothing changed */
if (rt->valid && if (rt->valid &&
@ -487,7 +488,7 @@ radv_rt_notify(struct channel *ch, struct rte_export *e)
else else
{ {
/* Withdraw */ /* Withdraw */
rt = fib_find(&p->routes, e->net); rt = fib_find(&p->routes, e->old.net);
if (!rt || !rt->valid) if (!rt || !rt->valid)
return; return;

19
proto/rip/rip.c
View File

@ -209,9 +209,10 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
rte e0 = { rte e0 = {
.attrs = &a0, .attrs = &a0,
.src = p->p.main_source, .src = p->p.main_source,
.net = en->n.addr,
}; };
rte_update(p->p.main_channel, en->n.addr, &e0); rte_update(p->p.main_channel, &e0);
} }
else else
rte_withdraw(p->p.main_channel, en->n.addr, p->p.main_source); rte_withdraw(p->p.main_channel, en->n.addr, p->p.main_source);
@ -315,10 +316,10 @@ rip_rt_notify(struct channel *ch, struct rte_export *e)
struct rip_entry *en; struct rip_entry *en;
int old_metric; int old_metric;
if (e->new) if (e->new.attrs)
{ {
/* Update */ /* Update */
rta *a = e->new->attrs; rta *a = e->new.attrs;
u32 rt_tag = ea_get_int(a->eattrs, EA_RIP_TAG, 0); u32 rt_tag = ea_get_int(a->eattrs, EA_RIP_TAG, 0);
u32 rt_metric = ea_get_int(a->eattrs, EA_RIP_METRIC, 1); u32 rt_metric = ea_get_int(a->eattrs, EA_RIP_METRIC, 1);
struct iface *rt_from = (struct iface *) ea_get_int(a->eattrs, EA_RIP_FROM, 0); struct iface *rt_from = (struct iface *) ea_get_int(a->eattrs, EA_RIP_FROM, 0);
@ -326,14 +327,14 @@ rip_rt_notify(struct channel *ch, struct rte_export *e)
if (rt_metric > p->infinity) if (rt_metric > p->infinity)
{ {
log(L_WARN "%s: Invalid rip_metric value %u for route %N", log(L_WARN "%s: Invalid rip_metric value %u for route %N",
p->p.name, rt_metric, e->net); p->p.name, rt_metric, e->new.net);
rt_metric = p->infinity; rt_metric = p->infinity;
} }
if (rt_tag > 0xffff) if (rt_tag > 0xffff)
{ {
log(L_WARN "%s: Invalid rip_tag value %u for route %N", log(L_WARN "%s: Invalid rip_tag value %u for route %N",
p->p.name, rt_tag, e->net); p->p.name, rt_tag, e->new.net);
rt_metric = p->infinity; rt_metric = p->infinity;
rt_tag = 0; rt_tag = 0;
} }
@ -345,7 +346,7 @@ rip_rt_notify(struct channel *ch, struct rte_export *e)
* collection. * collection.
*/ */
en = fib_get(&p->rtable, e->net); en = fib_get(&p->rtable, e->new.net);
old_metric = en->valid ? en->metric : -1; old_metric = en->valid ? en->metric : -1;
@ -359,7 +360,7 @@ rip_rt_notify(struct channel *ch, struct rte_export *e)
else else
{ {
/* Withdraw */ /* Withdraw */
en = fib_find(&p->rtable, e->net); en = fib_find(&p->rtable, e->old.net);
if (!en || en->valid != RIP_ENTRY_VALID) if (!en || en->valid != RIP_ENTRY_VALID)
return; return;
@ -1068,7 +1069,7 @@ rip_reload_routes(struct channel *C)
} }
static int static int
rip_rte_better(struct rte *new, struct rte *old) rip_rte_better(struct rte_storage *new, struct rte_storage *old)
{ {
u32 new_metric = ea_get_int(new->attrs->eattrs, EA_RIP_METRIC, 1); u32 new_metric = ea_get_int(new->attrs->eattrs, EA_RIP_METRIC, 1);
u32 old_metric = ea_get_int(old->attrs->eattrs, EA_RIP_METRIC, 1); u32 old_metric = ea_get_int(old->attrs->eattrs, EA_RIP_METRIC, 1);
@ -1170,7 +1171,7 @@ rip_reconfigure(struct proto *P, struct proto_config *CF)
} }
static void static void
rip_get_route_info(rte *rte, byte *buf) rip_get_route_info(rte *rte, struct rte_storage *er UNUSED, byte *buf)
{ {
u32 rt_metric = ea_get_int(rte->attrs->eattrs, EA_RIP_METRIC, 1); u32 rt_metric = ea_get_int(rte->attrs->eattrs, EA_RIP_METRIC, 1);
u32 rt_tag = ea_get_int(rte->attrs->eattrs, EA_RIP_TAG, 0); u32 rt_tag = ea_get_int(rte->attrs->eattrs, EA_RIP_TAG, 0);

3
proto/rpki/rpki.c
View File

@ -130,9 +130,10 @@ rpki_table_add_roa(struct rpki_cache *cache, struct channel *channel, const net_
rte e0 = { rte e0 = {
.attrs = &a0, .attrs = &a0,
.src = p->p.main_source, .src = p->p.main_source,
.net = &pfxr->n,
}; };
rte_update(channel, &pfxr->n, &e0); rte_update(channel, &e0);
} }
void void

10
proto/static/static.c
View File

@ -98,16 +98,16 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
if (r->state == SRS_CLEAN) if (r->state == SRS_CLEAN)
return; return;
/* We skip rta_lookup() here */
rte e0 = { rte e0 = {
.attrs = a, .attrs = a,
.src = p->p.main_source, .src = p->p.main_source,
}, *e = &e0; .net = r->net,
};
if (r->cmds) if (r->cmds)
f_eval_rte(r->cmds, &e, static_lp); f_eval_rte(r->cmds, &e0, static_lp);
rte_update(p->p.main_channel, r->net, e); rte_update(p->p.main_channel, &e0);
r->state = SRS_CLEAN; r->state = SRS_CLEAN;
if (r->cmds) if (r->cmds)
@ -356,7 +356,7 @@ static_bfd_notify(struct bfd_request *req)
} }
static int static int
static_rte_mergable(rte *pri UNUSED, rte *sec UNUSED) static_rte_mergable(struct rte_storage *pri UNUSED, struct rte_storage *sec UNUSED)
{ {
return 1; return 1;
} }

58
sysdep/bsd/krt-sock.c
View File

@ -199,7 +199,6 @@ sockaddr_fill_dl(struct sockaddr_dl *sa, struct iface *ifa)
static int static int
krt_send_route(struct krt_proto *p, int cmd, rte *e) krt_send_route(struct krt_proto *p, int cmd, rte *e)
{ {
net *net = e->net;
rta *a = e->attrs; rta *a = e->attrs;
static int msg_seq; static int msg_seq;
struct iface *j, *i = a->nh.iface; struct iface *j, *i = a->nh.iface;
@ -208,7 +207,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
char *body = (char *)msg.buf; char *body = (char *)msg.buf;
sockaddr gate, mask, dst; sockaddr gate, mask, dst;
DBG("krt-sock: send %I/%d via %I\n", net->n.prefix, net->n.pxlen, a->gw); DBG("krt-sock: send %N via %I\n", e->net, a->gw);
bzero(&msg,sizeof (struct rt_msghdr)); bzero(&msg,sizeof (struct rt_msghdr));
msg.rtm.rtm_version = RTM_VERSION; msg.rtm.rtm_version = RTM_VERSION;
@ -218,7 +217,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
msg.rtm.rtm_flags = RTF_UP | RTF_PROTO1; msg.rtm.rtm_flags = RTF_UP | RTF_PROTO1;
/* XXXX */ /* XXXX */
if (net_pxlen(net->n.addr) == net_max_prefix_length[net->n.addr->type]) if (net_pxlen(e->net) == net_max_prefix_length[e->net->type])
msg.rtm.rtm_flags |= RTF_HOST; msg.rtm.rtm_flags |= RTF_HOST;
else else
msg.rtm.rtm_addrs |= RTA_NETMASK; msg.rtm.rtm_addrs |= RTA_NETMASK;
@ -260,7 +259,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
int af = AF_UNSPEC; int af = AF_UNSPEC;
switch (net->n.addr->type) { switch (e->net->type) {
case NET_IP4: case NET_IP4:
af = AF_INET; af = AF_INET;
break; break;
@ -268,12 +267,12 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
af = AF_INET6; af = AF_INET6;
break; break;
default: default:
log(L_ERR "KRT: Not sending route %N to kernel", net->n.addr); log(L_ERR "KRT: Not sending route %N to kernel", e->net);
return -1; return -1;
} }
sockaddr_fill(&dst, af, net_prefix(net->n.addr), NULL, 0); sockaddr_fill(&dst, af, net_prefix(e->net), NULL, 0);
sockaddr_fill(&mask, af, net_pxmask(net->n.addr), NULL, 0); sockaddr_fill(&mask, af, net_pxmask(e->net), NULL, 0);
switch (a->dest) switch (a->dest)
{ {
@ -303,7 +302,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
#if __OpenBSD__ #if __OpenBSD__
/* Keeping temporarily old code for OpenBSD */ /* Keeping temporarily old code for OpenBSD */
struct ifa *addr = (net->n.addr->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6); struct ifa *addr = (e->net->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
if (!addr) if (!addr)
{ {
@ -339,7 +338,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
msg.rtm.rtm_msglen = l; msg.rtm.rtm_msglen = l;
if ((l = write(p->sys.sk->fd, (char *)&msg, l)) < 0) { if ((l = write(p->sys.sk->fd, (char *)&msg, l)) < 0) {
log(L_ERR "KRT: Error sending route %N to kernel: %m", net->n.addr); log(L_ERR "KRT: Error sending route %N to kernel: %m", e->net);
return -1; return -1;
} }
@ -347,22 +346,25 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
} }
void void
krt_replace_rte(struct krt_proto *p, rte *new, rte *old) krt_replace_rte(struct krt_proto *p, struct rte_export *e)
{ {
int err = 0; int err = 0;
enum rte_export_kind ek = rte_export_kind(e);
if (old) if (ek & REX_WITHDRAWAL)
krt_send_route(p, RTM_DELETE, old); krt_send_route(p, RTM_DELETE, &e->old);
if (new) if (ek & REX_ANNOUNCEMENT)
err = krt_send_route(p, RTM_ADD, new); err = krt_send_route(p, RTM_ADD, &e->new);
if (new) /* There is no need to update this bit for the old route. It is used solely together
* with the bit in export map in channel. */
if (ek & REX_ANNOUNCEMENT)
{ {
if (err < 0) if (err < 0)
bmap_clear(&p->sync_map, new->id); bmap_clear(&p->sync_map, e->new_id);
else else
bmap_set(&p->sync_map, new->id); bmap_set(&p->sync_map, e->new_id);
} }
} }
@ -374,7 +376,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
/* p is NULL iff KRT_SHARED_SOCKET and !scan */ /* p is NULL iff KRT_SHARED_SOCKET and !scan */
int ipv6; int ipv6;
net *net;
sockaddr dst, gate, mask; sockaddr dst, gate, mask;
ip_addr idst, igate, imask; ip_addr idst, igate, imask;
net_addr ndst; net_addr ndst;
@ -491,8 +492,6 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
else else
src = KRT_SRC_KERNEL; src = KRT_SRC_KERNEL;
net = net_get(p->p.main_channel->table, &ndst);
rta a = { rta a = {
.source = RTS_INHERIT, .source = RTS_INHERIT,
.scope = SCOPE_UNIVERSE, .scope = SCOPE_UNIVERSE,
@ -519,7 +518,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
if (!a.nh.iface) if (!a.nh.iface)
{ {
log(L_ERR "KRT: Received route %N with unknown ifindex %u", log(L_ERR "KRT: Received route %N with unknown ifindex %u",
net->n.addr, msg->rtm.rtm_index); &ndst, msg->rtm.rtm_index);
return; return;
} }
@ -542,19 +541,20 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
return; return;
log(L_ERR "KRT: Received route %N with strange next-hop %I", log(L_ERR "KRT: Received route %N with strange next-hop %I",
net->n.addr, a.nh.gw); &ndst, a.nh.gw);
return; return;
} }
} }
done:; done:;
rte e0 = {}, *e = &e0; rte e0 = {
e->attrs = &a; .attrs = &a,
e->net = net; .net = &ndst,
};
ea_list *ea = alloca(sizeof(ea_list) + 1 * sizeof(eattr)); ea_list *ea = alloca(sizeof(ea_list) + 1 * sizeof(eattr));
*ea = (ea_list) { .count = 1, .next = e->attrs->eattrs }; *ea = (ea_list) { .count = 1, .next = a.eattrs };
e->attrs->eattrs = ea; a.eattrs = ea;
ea->attrs[0] = (eattr) { ea->attrs[0] = (eattr) {
.id = EA_KRT_SOURCE, .id = EA_KRT_SOURCE,
@ -563,9 +563,9 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
}; };
if (scan) if (scan)
krt_got_route(p, e, src); krt_got_route(p, &e0, src);
else else
krt_got_route_async(p, e, new, src); krt_got_route_async(p, &e0, new, src);
} }
static void static void

74
sysdep/linux/netlink.c
View File

@ -105,7 +105,7 @@ struct nl_parse_state
int scan; int scan;
int merge; int merge;
net *net; net_addr *net;
rta *attrs; rta *attrs;
struct krt_proto *proto; struct krt_proto *proto;
s8 new; s8 new;
@ -1203,7 +1203,7 @@ static int
nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh) nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
{ {
eattr *ea; eattr *ea;
net *net = e->net; const net_addr *net = e->net;
rta *a = e->attrs; rta *a = e->attrs;
ea_list *eattrs = a->eattrs; ea_list *eattrs = a->eattrs;
int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh)); int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh));
@ -1218,7 +1218,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
int rsize = sizeof(*r) + bufsize; int rsize = sizeof(*r) + bufsize;
r = alloca(rsize); r = alloca(rsize);
DBG("nl_send_route(%N,op=%x)\n", net->n.addr, op); DBG("nl_send_route(%N,op=%x)\n", net, op);
bzero(&r->h, sizeof(r->h)); bzero(&r->h, sizeof(r->h));
bzero(&r->r, sizeof(r->r)); bzero(&r->r, sizeof(r->r));
@ -1227,7 +1227,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
r->h.nlmsg_flags = op | NLM_F_REQUEST | NLM_F_ACK; r->h.nlmsg_flags = op | NLM_F_REQUEST | NLM_F_ACK;
r->r.rtm_family = p->af; r->r.rtm_family = p->af;
r->r.rtm_dst_len = net_pxlen(net->n.addr); r->r.rtm_dst_len = net_pxlen(net);
r->r.rtm_protocol = RTPROT_BIRD; r->r.rtm_protocol = RTPROT_BIRD;
r->r.rtm_scope = RT_SCOPE_NOWHERE; r->r.rtm_scope = RT_SCOPE_NOWHERE;
#ifdef HAVE_MPLS_KERNEL #ifdef HAVE_MPLS_KERNEL
@ -1239,7 +1239,7 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
* 2) Never use RTA_PRIORITY * 2) Never use RTA_PRIORITY
*/ */
u32 label = net_mpls(net->n.addr); u32 label = net_mpls(net);
nl_add_attr_mpls(&r->h, rsize, RTA_DST, 1, &label); nl_add_attr_mpls(&r->h, rsize, RTA_DST, 1, &label);
r->r.rtm_scope = RT_SCOPE_UNIVERSE; r->r.rtm_scope = RT_SCOPE_UNIVERSE;
r->r.rtm_type = RTN_UNICAST; r->r.rtm_type = RTN_UNICAST;
@ -1247,12 +1247,12 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
else else
#endif #endif
{ {
nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(net->n.addr)); nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(net));
/* Add source address for IPv6 SADR routes */ /* Add source address for IPv6 SADR routes */
if (net->n.addr->type == NET_IP6_SADR) if (net->type == NET_IP6_SADR)
{ {
net_addr_ip6_sadr *a = (void *) &net->n.addr; net_addr_ip6_sadr *a = (void *) &net;
nl_add_attr_ip6(&r->h, rsize, RTA_SRC, a->src_prefix); nl_add_attr_ip6(&r->h, rsize, RTA_SRC, a->src_prefix);
r->r.rtm_src_len = a->src_pxlen; r->r.rtm_src_len = a->src_pxlen;
} }
@ -1394,7 +1394,7 @@ nl_replace_rte(struct krt_proto *p, rte *e)
void void
krt_replace_rte(struct krt_proto *p, rte *new, rte *old) krt_replace_rte(struct krt_proto *p, struct rte_export *e)
{ {
int err = 0; int err = 0;
@ -1410,30 +1410,34 @@ krt_replace_rte(struct krt_proto *p, rte *new, rte *old)
* old route value, so we do not try to optimize IPv6 ECMP reconfigurations. * old route value, so we do not try to optimize IPv6 ECMP reconfigurations.
*/ */
if (krt_ipv4(p) && old && new) enum rte_export_kind ek = rte_export_kind(e);
if (krt_ipv4(p) && (ek == REX_UPDATE))
{ {
err = nl_replace_rte(p, new); err = nl_replace_rte(p, &e->new);
} }
else else
{ {
if (old) if (ek & REX_WITHDRAWAL)
nl_delete_rte(p, old); nl_delete_rte(p, &e->old);
if (new) if (ek & REX_ANNOUNCEMENT)
err = nl_add_rte(p, new); err = nl_add_rte(p, &e->new);
} }
if (new) /* There is no need to update this bit for the old route. It is used solely together
* with the bit in export map in channel. */
if (ek & REX_ANNOUNCEMENT)
{ {
if (err < 0) if (err < 0)
bmap_clear(&p->sync_map, new->id); bmap_clear(&p->sync_map, e->new_id);
else else
bmap_set(&p->sync_map, new->id); bmap_set(&p->sync_map, e->new_id);
} }
} }
static int static int
nl_mergable_route(struct nl_parse_state *s, net *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family) nl_mergable_route(struct nl_parse_state *s, const net_addr *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family)
{ {
/* Route merging is used for IPv6 scans */ /* Route merging is used for IPv6 scans */
if (!s->scan || (rtm_family != AF_INET6)) if (!s->scan || (rtm_family != AF_INET6))
@ -1629,9 +1633,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
net6_prefix(&src), net6_pxlen(&src)); net6_prefix(&src), net6_pxlen(&src));
} }
net *net = net_get(p->p.main_channel->table, n); if (s->net && !nl_mergable_route(s, n, p, priority, i->rtm_type, i->rtm_family))
if (s->net && !nl_mergable_route(s, net, p, priority, i->rtm_type, i->rtm_family))
nl_announce_route(s); nl_announce_route(s);
rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE); rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
@ -1648,7 +1650,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
struct nexthop *nh = nl_parse_multipath(s, p, a[RTA_MULTIPATH], i->rtm_family); struct nexthop *nh = nl_parse_multipath(s, p, a[RTA_MULTIPATH], i->rtm_family);
if (!nh) if (!nh)
{ {
log(L_ERR "KRT: Received strange multipath route %N", net->n.addr); log(L_ERR "KRT: Received strange multipath route %N", n);
return; return;
} }
@ -1659,7 +1661,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ra->nh.iface = if_find_by_index(oif); ra->nh.iface = if_find_by_index(oif);
if (!ra->nh.iface) if (!ra->nh.iface)
{ {
log(L_ERR "KRT: Received route %N with unknown ifindex %u", net->n.addr, oif); log(L_ERR "KRT: Received route %N with unknown ifindex %u", n, oif);
return; return;
} }
@ -1686,7 +1688,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
(ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0); (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
if (!nbr || (nbr->scope == SCOPE_HOST)) if (!nbr || (nbr->scope == SCOPE_HOST))
{ {
log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr, log(L_ERR "KRT: Received route %N with strange next-hop %I", n,
ra->nh.gw); ra->nh.gw);
return; return;
} }
@ -1781,29 +1783,29 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
{ {
u32 metrics[KRT_METRICS_MAX]; u32 metrics[KRT_METRICS_MAX];
ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + KRT_METRICS_MAX * sizeof(eattr)); ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + KRT_METRICS_MAX * sizeof(eattr));
int t, n = 0; int t, na = 0;
if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0) if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0)
{ {
log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net->n.addr); log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", n);
return; return;
} }
for (t = 1; t < KRT_METRICS_MAX; t++) for (t = 1; t < KRT_METRICS_MAX; t++)
if (metrics[0] & (1 << t)) if (metrics[0] & (1 << t))
{ {
ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t); ea->attrs[na].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
ea->attrs[n].flags = 0; ea->attrs[na].flags = 0;
ea->attrs[n].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */ ea->attrs[na].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */
ea->attrs[n].u.data = metrics[t]; ea->attrs[na].u.data = metrics[t];
n++; na++;
} }
if (n > 0) if (na > 0)
{ {
ea->next = ra->eattrs; ea->next = ra->eattrs;
ea->flags = EALF_SORTED; ea->flags = EALF_SORTED;
ea->count = n; ea->count = na;
ra->eattrs = ea; ra->eattrs = ea;
} }
} }
@ -1819,7 +1821,9 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
if (!s->net) if (!s->net)
{ {
/* Store the new route */ /* Store the new route */
s->net = net; s->net = lp_alloc(s->pool, n->length);
net_copy(s->net, n);
s->attrs = ra; s->attrs = ra;
s->proto = p; s->proto = p;
s->new = new; s->new = new;

161
sysdep/unix/krt.c
View File

@ -251,14 +251,14 @@ static inline void
krt_trace_in(struct krt_proto *p, rte *e, char *msg) krt_trace_in(struct krt_proto *p, rte *e, char *msg)
{ {
if (p->p.debug & D_PACKETS) if (p->p.debug & D_PACKETS)
log(L_TRACE "%s: %N: %s", p->p.name, e->net->n.addr, msg); log(L_TRACE "%s: %N: %s", p->p.name, e->net, msg);
} }
static inline void static inline void
krt_trace_in_rl(struct tbf *f, struct krt_proto *p, rte *e, char *msg) krt_trace_in_rl(struct tbf *f, struct krt_proto *p, rte *e, char *msg)
{ {
if (p->p.debug & D_PACKETS) if (p->p.debug & D_PACKETS)
log_rl(f, L_TRACE "%s: %N: %s", p->p.name, e->net->n.addr, msg); log_rl(f, L_TRACE "%s: %N: %s", p->p.name, e->net, msg);
} }
/* /*
@ -278,33 +278,34 @@ static struct tbf rl_alien = TBF_DEFAULT_LOG_LIMITS;
*/ */
static inline u32 static inline u32
krt_metric(rte *a) krt_metric(struct rte_storage *a)
{ {
eattr *ea = ea_find(a->attrs->eattrs, EA_KRT_METRIC); eattr *ea = ea_find(a->attrs->eattrs, EA_KRT_METRIC);
return ea ? ea->u.data : 0; return ea ? ea->u.data : 0;
} }
static inline int static inline int
krt_same_key(rte *a, rte *b) krt_same_key(struct rte_storage *a, struct rte_storage *b)
{ {
return (krt_metric(a) == krt_metric(b)); return (krt_metric(a) == krt_metric(b));
} }
static inline int static inline int
krt_uptodate(rte *a, rte *b) krt_uptodate(struct rte_storage *a, struct rte_storage *b)
{ {
return (a->attrs == b->attrs); return (a->attrs == b->attrs);
} }
static void static void
krt_learn_announce_update(struct krt_proto *p, rte *e) krt_learn_announce_update(struct krt_proto *p, struct rte_storage *e)
{ {
rte e0 = { rte e0 = {
.attrs = rta_clone(e->attrs), .attrs = e->attrs,
.src = p->p.main_source, .src = p->p.main_source,
.net = e->net->n.addr,
}; };
rte_update(p->p.main_channel, e->net->n.addr, &e0); rte_update(p->p.main_channel, &e0);
} }
static void static void
@ -317,21 +318,20 @@ krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
static void static void
krt_learn_scan(struct krt_proto *p, rte *e) krt_learn_scan(struct krt_proto *p, rte *e)
{ {
net *n0 = e->net; net *n = net_get(&p->krt_table, e->net);
net *n = net_get(&p->krt_table, n0->n.addr); struct rte_storage *er = rte_store(e, n);
rte *m, **mm; struct rte_storage *m, **mm;
e = rte_store(e);
for(mm=&n->routes; m = *mm; mm=&m->next) for(mm=&n->routes; m = *mm; mm=&m->next)
if (krt_same_key(m, e)) if (krt_same_key(m, er))
break; break;
if (m) if (m)
{ {
if (krt_uptodate(m, e)) if (krt_uptodate(m, er))
{ {
krt_trace_in_rl(&rl_alien, p, e, "[alien] seen"); krt_trace_in_rl(&rl_alien, p, e, "[alien] seen");
rte_free(e); rte_free(er);
m->pflags |= KRT_REF_SEEN; m->pflags |= KRT_REF_SEEN;
} }
else else
@ -344,11 +344,12 @@ krt_learn_scan(struct krt_proto *p, rte *e)
} }
else else
krt_trace_in(p, e, "[alien] created"); krt_trace_in(p, e, "[alien] created");
if (!m) if (!m)
{ {
e->next = n->routes; er->next = n->routes;
n->routes = e; n->routes = er;
e->pflags |= KRT_REF_SEEN; er->pflags |= KRT_REF_SEEN;
} }
} }
@ -364,7 +365,7 @@ krt_learn_prune(struct krt_proto *p)
again: again:
FIB_ITERATE_START(fib, &fit, net, n) FIB_ITERATE_START(fib, &fit, net, n)
{ {
rte *e, **ee, *best, **pbest, *old_best; struct rte_storage *e, **ee, *best, **pbest, *old_best;
/* /*
* Note that old_best may be NULL even if there was an old best route in * Note that old_best may be NULL even if there was an old best route in
@ -429,27 +430,28 @@ again:
static void static void
krt_learn_async(struct krt_proto *p, rte *e, int new) krt_learn_async(struct krt_proto *p, rte *e, int new)
{ {
net *n0 = e->net; net *n = net_get(&p->krt_table, e->net);
net *n = net_get(&p->krt_table, n0->n.addr); struct rte_storage *g, **gg, *best, **bestp, *old_best;
rte *g, **gg, *best, **bestp, *old_best;
ASSERT(!e->attrs->cached); ASSERT(!e->attrs->cached);
e->attrs->pref = p->p.main_channel->preference; e->attrs->pref = p->p.main_channel->preference;
e = rte_store(e); struct rte_storage *er = rte_store(e, n);
old_best = n->routes; old_best = n->routes;
for(gg=&n->routes; g = *gg; gg = &g->next) for(gg=&n->routes; g = *gg; gg = &g->next)
if (krt_same_key(g, e)) if (krt_same_key(g, er))
break; break;
if (new) if (new)
{ {
if (g) if (g)
{ {
if (krt_uptodate(g, e)) if (krt_uptodate(g, er))
{ {
krt_trace_in(p, e, "[alien async] same"); krt_trace_in(p, e, "[alien async] same");
rte_free(e); rte_free(er);
return; return;
} }
krt_trace_in(p, e, "[alien async] updated"); krt_trace_in(p, e, "[alien async] updated");
@ -459,20 +461,20 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
else else
krt_trace_in(p, e, "[alien async] created"); krt_trace_in(p, e, "[alien async] created");
e->next = n->routes; er->next = n->routes;
n->routes = e; n->routes = er;
} }
else if (!g) else if (!g)
{ {
krt_trace_in(p, e, "[alien async] delete failed"); krt_trace_in(p, e, "[alien async] delete failed");
rte_free(e); rte_free(er);
return; return;
} }
else else
{ {
krt_trace_in(p, e, "[alien async] removed"); krt_trace_in(p, e, "[alien async] removed");
*gg = g->next; *gg = g->next;
rte_free(e); rte_free(er);
rte_free(g); rte_free(g);
} }
best = n->routes; best = n->routes;
@ -552,50 +554,43 @@ krt_flush_routes(struct krt_proto *p)
{ {
if (krt_is_installed(p, n)) if (krt_is_installed(p, n))
{ {
struct rte_export e = {
.old = rte_copy(n->routes),
.old_id = n->routes->id,
};
/* FIXME: this does not work if gw is changed in export filter */ /* FIXME: this does not work if gw is changed in export filter */
krt_replace_rte(p, NULL, n->routes); krt_replace_rte(p, &e);
} }
} }
FIB_WALK_END; FIB_WALK_END;
} }
static struct rte * static _Bool
krt_export_net(struct krt_proto *p, net *net, rte **rt_free) krt_export_net(struct krt_proto *p, net *net, rte *rt)
{ {
struct channel *c = p->p.main_channel; struct channel *c = p->p.main_channel;
const struct filter *filter = c->out_filter; const struct filter *filter = c->out_filter;
rte *rt;
if (c->ra_mode == RA_MERGED) if (c->ra_mode == RA_MERGED)
return rt_export_merged(c, net, rt_free, krt_filter_lp, 1); return rt_export_merged(c, net, rt, krt_filter_lp, 1);
rt = net->routes; if (!rte_is_valid(net->routes))
*rt_free = NULL; return 0;
if (!rte_is_valid(rt))
return NULL;
if (filter == FILTER_REJECT) if (filter == FILTER_REJECT)
return NULL; return 0;
/* We could run krt_preexport() here, but it is already handled by krt_is_installed() */ /* We could run krt_preexport() here, but it is already handled by krt_is_installed() */
*rt = rte_copy(net->routes);
if (filter == FILTER_ACCEPT) if (filter == FILTER_ACCEPT)
goto accept; return 1;
if (f_run(filter, &rt, krt_filter_lp, FF_SILENT) > F_ACCEPT) if (f_run(filter, rt, krt_filter_lp, FF_SILENT) > F_ACCEPT)
goto reject; return 0;
return 1;
accept:
if (rt != net->routes)
*rt_free = rt;
return rt;
reject:
if (rt != net->routes)
rte_free(rt);
return NULL;
} }
static int static int
@ -620,8 +615,10 @@ krt_same_dest(rte *k, rte *e)
void void
krt_got_route(struct krt_proto *p, rte *e, s8 src) krt_got_route(struct krt_proto *p, rte *e, s8 src)
{ {
rte *new = NULL, *rt_free = NULL;
net *n = e->net; struct rte_export ex = {
.old = *e,
};
#ifdef KRT_ALLOW_LEARN #ifdef KRT_ALLOW_LEARN
switch (src) switch (src)
@ -647,24 +644,24 @@ krt_got_route(struct krt_proto *p, rte *e, s8 src)
if (!p->ready) if (!p->ready)
goto ignore; goto ignore;
if (!krt_is_installed(p, n)) net *n = net_find(p->p.main_channel->table, e->net);
if (!n || !krt_is_installed(p, n))
goto delete; goto delete;
new = krt_export_net(p, n, &rt_free);
/* Rejected by filters */ /* Rejected by filters */
if (!new) if (!krt_export_net(p, n, &ex.new))
goto delete; goto delete;
/* Route to this destination was already seen. Strange, but it happens... */ /* Route to this destination was already seen. Strange, but it happens... */
if (bmap_test(&p->seen_map, new->id)) if (bmap_test(&p->seen_map, n->routes->id))
goto aseen; goto aseen;
/* Mark route as seen */ /* Mark route as seen */
bmap_set(&p->seen_map, new->id); bmap_set(&p->seen_map, n->routes->id);
/* TODO: There also may be changes in route eattrs, we ignore that for now. */ /* TODO: There also may be changes in route eattrs, we ignore that for now. */
if (!bmap_test(&p->sync_map, new->id) || !krt_same_dest(e, new)) if (!bmap_test(&p->sync_map, n->routes->id) || !krt_same_dest(e, &ex.new))
goto update; goto update;
goto seen; goto seen;
@ -682,19 +679,17 @@ ignore:
goto done; goto done;
update: update:
krt_trace_in(p, new, "updating"); krt_trace_in(p, &ex.new, "updating");
krt_replace_rte(p, new, e); ex.new_id = n->routes->id;
krt_replace_rte(p, &ex);
goto done; goto done;
delete: delete:
krt_trace_in(p, e, "deleting"); krt_trace_in(p, e, "deleting");
krt_replace_rte(p, NULL, e); krt_replace_rte(p, &ex);
goto done; goto done;
done: done:
if (rt_free)
rte_free(rt_free);
lp_flush(krt_filter_lp); lp_flush(krt_filter_lp);
} }
@ -714,18 +709,16 @@ krt_prune(struct krt_proto *p)
{ {
if (p->ready && krt_is_installed(p, n) && !bmap_test(&p->seen_map, n->routes->id)) if (p->ready && krt_is_installed(p, n) && !bmap_test(&p->seen_map, n->routes->id))
{ {
rte *rt_free = NULL; struct rte_export ex = {
rte *new = krt_export_net(p, n, &rt_free); .new_id = n->routes->id
};
if (new) if (krt_export_net(p, n, &ex.new))
{ {
krt_trace_in(p, new, "installing"); krt_trace_in(p, &ex.new, "installing");
krt_replace_rte(p, new, NULL); krt_replace_rte(p, &ex);
} }
if (rt_free)
rte_free(rt_free);
lp_flush(krt_filter_lp); lp_flush(krt_filter_lp);
} }
} }
@ -753,7 +746,8 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new, s8 src)
if (new) if (new)
{ {
krt_trace_in(p, e, "[redirect] deleting"); krt_trace_in(p, e, "[redirect] deleting");
krt_replace_rte(p, NULL, e); struct rte_export ex = { .old = *e };
krt_replace_rte(p, &ex);
} }
/* If !new, it is probably echo of our deletion */ /* If !new, it is probably echo of our deletion */
break; break;
@ -873,10 +867,9 @@ krt_scan_timer_kick(struct krt_proto *p)
*/ */
static int static int
krt_preexport(struct proto *P, rte *e) krt_preexport(struct channel *c, rte *e)
{ {
// struct krt_proto *p = (struct krt_proto *) P; if (e->src->proto == c->proto)
if (e->src->proto == P)
return -1; return -1;
if (!krt_capable(e)) if (!krt_capable(e))
@ -900,12 +893,12 @@ krt_rt_notify(struct channel *ch, struct rte_export *e)
* but if we processed the update as usual, we would send withdraw to the * but if we processed the update as usual, we would send withdraw to the
* kernel, which would remove the new imported route instead. * kernel, which would remove the new imported route instead.
*/ */
if (!e->new && (e->new_src->proto == ch->proto)) if (!e->new.attrs && (e->new.src->proto == ch->proto))
return; return;
#endif #endif
if (p->initialized) /* Before first scan we don't touch the routes */ if (p->initialized) /* Before first scan we don't touch the routes */
krt_replace_rte(p, e->new, e->old); krt_replace_rte(p, e);
} }
static void static void

8
sysdep/unix/krt.h
View File

@ -83,11 +83,11 @@ void krt_got_route(struct krt_proto *p, struct rte *e, s8 src);
void krt_got_route_async(struct krt_proto *p, struct rte *e, int new, s8 src); void krt_got_route_async(struct krt_proto *p, struct rte *e, int new, s8 src);
static inline int static inline int
krt_get_sync_error(struct krt_proto *p, struct rte *e) krt_get_sync_error(struct krt_proto *p, u32 id)
{ {
return (p->p.proto_state == PS_UP) && return (p->p.proto_state == PS_UP) &&
bmap_test(&p->p.main_channel->export_map, e->id) && bmap_test(&p->p.main_channel->export_map, id) &&
!bmap_test(&p->sync_map, e->id); !bmap_test(&p->sync_map, id);
} }
/* Values for rte->u.krt_sync.src */ /* Values for rte->u.krt_sync.src */
@ -143,7 +143,7 @@ void krt_sys_copy_config(struct krt_config *, struct krt_config *);
int krt_capable(rte *e); int krt_capable(rte *e);
void krt_do_scan(struct krt_proto *); void krt_do_scan(struct krt_proto *);
void krt_replace_rte(struct krt_proto *p, rte *new, rte *old); void krt_replace_rte(struct krt_proto *p, struct rte_export *e);
int krt_sys_get_attr(const eattr *a, byte *buf, int buflen); int krt_sys_get_attr(const eattr *a, byte *buf, int buflen);