diff --git a/nest/proto.c b/nest/proto.c
index 31ee1fa1c8d30e24e35b0ca56d5bcc0f40746373..7cfb1555a365581d369476da47e0ea8e20affb6a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -2243,8 +2243,13 @@ proto_apply_cmd_symbol(const struct symbol *s, void (* cmd)(struct proto *, uint
return;
}
- cmd(s->proto->proto, arg, 0);
- cli_msg(0, "");
+ if (s->proto->proto)
+ {
+ cmd(s->proto->proto, arg, 0);
+ cli_msg(0, "");
+ }
+ else
+ cli_msg(9002, "%s does not exist", s->name);
}
static void
diff --git a/nest/protocol.h b/nest/protocol.h
index abcc505d4ce320ec4287a73561c23ab7ec25f8e5..6ee97b7cd2d4fb7935fa91cbb33241d850bc2dfa 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -200,10 +200,11 @@ struct proto {
* neigh_notify Notify protocol about neighbor cache events.
* make_tmp_attrs Add attributes to rta from from private attrs stored in rte. The route and rta MUST NOT be cached.
* store_tmp_attrs Store private attrs back to rte and undef added attributes. The route and rta MUST NOT be cached.
- * preexport Called as the first step of the route exporting process.
- * It can construct a new rte, add private attributes and
- * decide whether the route shall be exported: 1=yes, -1=no,
- * 0=process it through the export filter set by the user.
+ * preexport Called as the first step of the route exporting process.
+ * It can decide whether the route shall be exported:
+ * -1 = reject,
+ * 0 = continue to export filter
+ * 1 = accept immediately
* reload_routes Request channel to reload all its routes to the core
* (using rte_update()). Returns: 0=reload cannot be done,
* 1= reload is scheduled and will happen (asynchronously).
@@ -217,7 +218,7 @@ struct proto {
void (*neigh_notify)(struct neighbor *neigh);
void (*make_tmp_attrs)(struct rte *rt, struct linpool *pool);
void (*store_tmp_attrs)(struct rte *rt, struct linpool *pool);
- int (*preexport)(struct proto *, struct rte **rt, struct linpool *pool);
+ int (*preexport)(struct proto *, struct rte *rt);
void (*reload_routes)(struct channel *);
void (*feed_begin)(struct channel *, int initial);
void (*feed_end)(struct channel *);
diff --git a/nest/route.h b/nest/route.h
index 7930058a4598b7b98f928ce9f275c5b47dec4056..75890a71af3dd3fb93638cbfc2e422cb91aa1ed7 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -378,7 +378,7 @@ int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src
int rt_reload_channel(struct channel *c);
void rt_reload_channel_abort(struct channel *c);
void rt_prune_sync(rtable *t, int all);
-int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed);
+int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, rte **old_exported, int refeed);
struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
static inline int rt_is_ip(rtable *tab)
diff --git a/nest/rt-show.c b/nest/rt-show.c
index f8b7ba510caa7ac6323be30e115d29bbccd469d1..b24befa2725fc6f4982753420f22e9ba54689ba2 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -154,7 +154,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
else if (d->export_mode)
{
struct proto *ep = ec->proto;
- int ic = ep->preexport ? ep->preexport(ep, &e, c->show_pool) : 0;
+ int ic = ep->preexport ? ep->preexport(ep, e) : 0;
if (ec->ra_mode == RA_OPTIMAL || ec->ra_mode == RA_MERGED)
pass = 1;
@@ -393,7 +393,7 @@ rt_show_get_default_tables(struct rt_show_data *d)
}
for (int i=1; i<NET_MAX; i++)
- if (config->def_tables[i])
+ if (config->def_tables[i] && config->def_tables[i]->table)
rt_show_add_table(d, config->def_tables[i]->table);
}
diff --git a/nest/rt-table.c b/nest/rt-table.c
index a10979e6acba9dd99892f4a9f37a1677d37fa930..36bf1364b21af8786b86e1462e46cf13c8350bc5 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -617,6 +617,26 @@ rte_cow_rta(rte *r, linpool *lp)
return r;
}
+/**
+ * rte_free - delete a &rte
+ * @e: &rte to be deleted
+ *
+ * rte_free() deletes the given &rte from the routing table it's linked to.
+ */
+void
+rte_free(rte *e)
+{
+ if (rta_is_cached(e->attrs))
+ rta_free(e->attrs);
+ sl_free(rte_slab, e);
+}
+
+static inline void
+rte_free_quick(rte *e)
+{
+ rta_free(e->attrs);
+ sl_free(rte_slab, e);
+}
/**
* rte_init_tmp_attrs - initialize temporary ea_list for route
@@ -869,7 +889,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
rt = rt0;
*rt_free = NULL;
- v = p->preexport ? p->preexport(p, &rt, pool) : 0;
+ v = p->preexport ? p->preexport(p, rt) : 0;
if (v < 0)
{
if (silent)
@@ -951,8 +971,14 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
}
/* Apply export table */
- if (c->out_table && !rte_update_out(c, net->n.addr, new, old, refeed))
- return;
+ struct rte *old_exported = NULL;
+ if (c->out_table)
+ {
+ if (!rte_update_out(c, net->n.addr, new, old, &old_exported, refeed))
+ return;
+ }
+ else if (c->out_filter == FILTER_ACCEPT)
+ old_exported = old;
if (new)
stats->exp_updates_accepted++;
@@ -982,6 +1008,9 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
}
p->rt_notify(p, c, net, new, old);
+
+ if (c->out_table && old_exported)
+ rte_free_quick(old_exported);
}
static void
@@ -1341,27 +1370,6 @@ rte_validate(rte *e)
return 1;
}
-/**
- * rte_free - delete a &rte
- * @e: &rte to be deleted
- *
- * rte_free() deletes the given &rte from the routing table it's linked to.
- */
-void
-rte_free(rte *e)
-{
- if (rta_is_cached(e->attrs))
- rta_free(e->attrs);
- sl_free(rte_slab, e);
-}
-
-static inline void
-rte_free_quick(rte *e)
-{
- rta_free(e->attrs);
- sl_free(rte_slab, e);
-}
-
static int
rte_same(rte *x, rte *y)
{
@@ -1894,7 +1902,7 @@ rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
rte_update_lock();
/* Rest is stripped down export_filter() */
- int v = p->preexport ? p->preexport(p, &rt, rte_update_pool) : 0;
+ int v = p->preexport ? p->preexport(p, rt) : 0;
if (v == RIC_PROCESS)
{
rte_make_tmp_attrs(&rt, rte_update_pool, NULL);
@@ -3426,7 +3434,7 @@ again:
*/
int
-rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed)
+rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **old_exported, int refeed)
{
struct rtable *tab = c->out_table;
struct rte_src *src;
@@ -3472,7 +3480,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int re
/* Remove the old rte */
*pos = old->next;
- rte_free_quick(old);
+ *old_exported = old;
tab->rt_count--;
break;
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 174fc9e266548a5a332725cd15373524351fcf55..0444e7a41e260c7380539aaf638fc267e865b69b 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2231,10 +2231,9 @@ babel_kick_timer(struct babel_proto *p)
static int
-babel_preexport(struct proto *P, struct rte **new, struct linpool *pool UNUSED)
+babel_preexport(struct proto *P, struct rte *new)
{
- struct rta *a = (*new)->attrs;
-
+ struct rta *a = new->attrs;
/* Reject our own unreachable routes */
if ((a->dest == RTD_UNREACHABLE) && (a->src->proto == P))
return -1;
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 6c1ae176dbd7519fdd548273e230d3b6f95b357d..c35f9384ea5ccc85204966992c7c1bad32bd9c56 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1668,9 +1668,8 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
*/
int
-bgp_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+bgp_preexport(struct proto *P, rte *e)
{
- rte *e = *new;
struct proto *SRC = e->attrs->src->proto;
struct bgp_proto *p = (struct bgp_proto *) P;
struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index f2c1186936713006a4963cf667340892f542b426..9d25da21eeb3abfe032e39f295025edf6d90986e 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -585,7 +585,7 @@ int bgp_rte_mergable(rte *pri, rte *sec);
int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
void bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old);
-int bgp_preexport(struct proto *, struct rte **, struct linpool *);
+int bgp_preexport(struct proto *, struct rte *);
int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
void bgp_get_route_info(struct rte *, byte *buf);
int bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad);
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index ebebf0ff26364e569c6fc85aaa657df624c53473..48e078ed5858100918da0b6a09b427becd61a8fb 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -107,7 +107,7 @@
#include <stdlib.h>
#include "ospf.h"
-static int ospf_preexport(struct proto *P, rte **new, struct linpool *pool);
+static int ospf_preexport(struct proto *P, rte *new);
static void ospf_make_tmp_attrs(struct rte *rt, struct linpool *pool);
static void ospf_store_tmp_attrs(struct rte *rt, struct linpool *pool);
static void ospf_reload_routes(struct channel *C);
@@ -484,11 +484,10 @@ ospf_disp(timer * timer)
* import to the filters.
*/
static int
-ospf_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+ospf_preexport(struct proto *P, rte *e)
{
struct ospf_proto *p = (struct ospf_proto *) P;
struct ospf_area *oa = ospf_main_area(p);
- rte *e = *new;
/* Reject our own routes */
if (e->attrs->src->proto == P)
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index f991d09ab3f753ab9924a320a9325b899c996cb3..cc4b5a0734ea6c9fd9adbe43c5373374687d7c2d 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -101,9 +101,9 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
}
static int
-pipe_preexport(struct proto *P, rte **ee, struct linpool *p UNUSED)
+pipe_preexport(struct proto *P, rte *e)
{
- struct proto *pp = (*ee)->sender->proto;
+ struct proto *pp = e->sender->proto;
if (pp == P)
return -1; /* Avoid local loops automatically */
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 66e8eb4bbde24af361dc909ea9f5627baebfe140..540ff2a7a418e305c27bb55f88cc0086fbb7a9e5 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -391,12 +391,12 @@ radv_net_match_trigger(struct radv_config *cf, net *n)
}
int
-radv_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+radv_preexport(struct proto *P, rte *new)
{
// struct radv_proto *p = (struct radv_proto *) P;
struct radv_config *cf = (struct radv_config *) (P->cf);
- if (radv_net_match_trigger(cf, (*new)->net))
+ if (radv_net_match_trigger(cf, new->net))
return RIC_PROCESS;
if (cf->propagate_routes)
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 7c2614b101047c96bb7645a928e749e62942d2fd..da61fc9c8ed99976f23fcd9c986ebd34b9be1082 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -903,11 +903,9 @@ krt_store_tmp_attrs(struct rte *rt, struct linpool *pool)
}
static int
-krt_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+krt_preexport(struct proto *P, rte *e)
{
// struct krt_proto *p = (struct krt_proto *) P;
- rte *e = *new;
-
if (e->attrs->src->proto == P)
return -1;