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

nest/protocol.h

+6 −5

Original line number	Diff line number	Diff line
		@@ -198,9 +198,10 @@ struct proto {
		* rt_notify Notify protocol about routing table updates.
		* neigh_notify Notify protocol about neighbor cache events.
		* 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).
		@@ -212,7 +213,7 @@ struct proto {
		void (ifa_notify)(struct proto , unsigned flags, struct ifa *a);
		void (rt_notify)(struct channel , struct rte_export *);
		void (neigh_notify)(struct neighbor neigh);
		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
		@@ -153,7 +153,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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@ export_filter_(struct channel c, rte rt0, rte *rt_free, linpool pool, int si
		if (silent && bmap_test(&c->export_reject_map, rt0->id))
		return NULL;

		v = p->preexport ? p->preexport(p, &rt, pool) : 0;
		v = p->preexport ? p->preexport(p, rt) : 0;
		if (v < 0)
		{
		if (silent)

+2 −2

Original line number	Diff line number	Diff line
		@@ -2100,10 +2100,10 @@ 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)
		{
		/* Reject our own unreachable routes */
		if (((new)->attrs->dest == RTD_UNREACHABLE) && ((new)->src->proto == P))
		if ((new->attrs->dest == RTD_UNREACHABLE) && (new->src->proto == P))
		return -1;

		return 0;

+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->src->proto;
		struct bgp_proto p = (struct bgp_proto ) P;
		struct bgp_proto src = (SRC->proto == &proto_bgp) ? (struct bgp_proto ) SRC : NULL;