Preexport: No route modification, no linpool needed (d5a32563) · Commits · 戴 / Bird

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 );

+1 −1

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;

+2 −2

Original line number	Diff line number	Diff line
		@@ -605,7 +605,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)
		@@ -1605,7 +1605,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);

+2 −3

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1661,9 +1661,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;