Merge commit 'd5a32563' into haugesund (ff47cd80) · Commits · 戴 / Bird

nest/proto.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -2243,9 +2243,14 @@ proto_apply_cmd_symbol(const struct symbol s, void ( cmd)(struct proto *, uint
		return;
		}

		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
		proto_apply_cmd_patt(const char patt, void ( cmd)(struct proto *, uintptr_t, int), uintptr_t arg)

nest/protocol.h

+6 −5

Original line number	Diff line number	Diff line
		@@ -201,9 +201,10 @@ struct proto {
		* 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.
		* 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 );

nest/route.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

nest/rt-show.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

nest/rt-table.c

+35 −27

Original line number	Diff line number	Diff line
		@@ -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))
		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;

Admin message