Nest: VRF of protocol can be explicitly specified as 'default' (18f70a62) · Commits · 戴 / Bird

nest/config.Y

+3 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ proto_postconfig(void)
		CF_DECLS

		CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
		CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, VRF, TABLE, STATES, ROUTES, FILTERS)
		CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, VRF, DEFAULT, TABLE, STATES, ROUTES, FILTERS)
		CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, SADR, MPLS)
		CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED)
		CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
		@@ -209,7 +209,8 @@ proto_item:
		\| MRTDUMP mrtdump_mask { this_proto->mrtdump = $2; }
		\| ROUTER ID idval { this_proto->router_id = $3; }
		\| DESCRIPTION text { this_proto->dsc = $2; }
		\| VRF text { this_proto->vrf = if_get_by_name($2); }
		\| VRF text { this_proto->vrf = if_get_by_name($2); this_proto->vrf_set = 1; }
		\| VRF DEFAULT { this_proto->vrf = NULL; this_proto->vrf_set = 1; }
		;

nest/iface.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ ifa_send_notify(struct proto p, unsigned c, struct ifa a)
		{
		if (p->ifa_notify &&
		(p->proto_state != PS_DOWN) &&
		(!p->vrf \|\| p->vrf == a->iface->master))
		(!p->vrf_set \|\| p->vrf == a->iface->master))
		{
		if (p->debug & D_IFACES)
		log(L_TRACE "%s < address %N on interface %s %s",
		@@ -185,7 +185,7 @@ if_send_notify(struct proto p, unsigned c, struct iface i)
		{
		if (p->if_notify &&
		(p->proto_state != PS_DOWN) &&
		(!p->vrf \|\| p->vrf == i->master))
		(!p->vrf_set \|\| p->vrf == i->master))
		{
		if (p->debug & D_IFACES)
		log(L_TRACE "%s < interface %s %s", p->name, i->name,

nest/neighbor.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ if_connected(ip_addr a, struct iface i, struct ifa *ap, uint flags)
		}

		static inline int
		if_connected_any(ip_addr a, struct iface vrf, struct iface iface, struct ifa *addr, uint flags)
		if_connected_any(ip_addr a, struct iface vrf, uint vrf_set, struct iface iface, struct ifa *addr, uint flags)
		{
		struct iface *i;
		struct ifa *b;
		@@ -127,7 +127,7 @@ if_connected_any(ip_addr a, struct iface vrf, struct iface *iface, struct ifa

		/* Get first match, but prefer SCOPE_HOST to other matches */
		WALK_LIST(i, iface_list)
		if ((!vrf \|\| vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
		if ((!vrf_set \|\| vrf == i->master) && ((s = if_connected(a, i, &b, flags)) >= 0))
		if ((scope < 0) \|\| ((scope > SCOPE_HOST) && (s == SCOPE_HOST)))
		{
		*iface = i;
		@@ -192,7 +192,7 @@ neigh_find(struct proto p, ip_addr a, struct iface iface, uint flags)
		iface = (scope < 0) ? NULL : iface;
		}
		else
		scope = if_connected_any(a, p->vrf, &iface, &addr, flags);
		scope = if_connected_any(a, p->vrf, p->vrf_set, &iface, &addr, flags);

		/* scope < 0 means i don't know neighbor */
		/* scope >= 0 <=> iface != NULL */
		@@ -309,6 +309,7 @@ neigh_free(neighbor *n)
		void
		neigh_update(neighbor n, struct iface iface)
		{
		struct proto *p = n->proto;
		struct ifa *ifa = NULL;
		int scope = -1;

		@@ -317,14 +318,14 @@ neigh_update(neighbor n, struct iface iface)
		return;

		/* VRF-bound neighbors ignore changes in other VRFs */
		if (n->proto->vrf && (n->proto->vrf != iface->master))
		if (p->vrf_set && (p->vrf != iface->master))
		return;

		scope = if_connected(n->addr, iface, &ifa, n->flags);

		/* When neighbor is going down, try to respawn it on other ifaces */
		if ((scope < 0) && (n->scope >= 0) && !n->ifreq && (n->flags & NEF_STICKY))
		scope = if_connected_any(n->addr, n->proto->vrf, &iface, &ifa, n->flags);
		scope = if_connected_any(n->addr, p->vrf, p->vrf_set, &iface, &ifa, n->flags);

		/* No change or minor change - ignore or notify */
		if ((scope == n->scope) && (iface == n->iface))

nest/proto.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -765,6 +765,7 @@ proto_init(struct proto_config c, node n)
		p->proto_state = PS_DOWN;
		p->last_state_change = current_time();
		p->vrf = c->vrf;
		p->vrf_set = c->vrf_set;
		insert_node(&p->n, n);

		p->event = ev_new_init(proto_pool, proto_event, p);
		@@ -932,7 +933,8 @@ proto_reconfigure(struct proto p, struct proto_config oc, struct proto_config
		if ((nc->protocol != oc->protocol) \|\|
		(nc->net_type != oc->net_type) \|\|
		(nc->disabled != p->disabled) \|\|
		(nc->vrf != oc->vrf))
		(nc->vrf != oc->vrf) \|\|
		(nc->vrf_set != oc->vrf_set))
		return 0;

		p->name = nc->name;
		@@ -1838,8 +1840,8 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
		cli_msg(-1006, " Message: %s", p->message);
		if (p->cf->router_id)
		cli_msg(-1006, " Router ID: %R", p->cf->router_id);
		if (p->vrf)
		cli_msg(-1006, " VRF: %s", p->vrf->name);
		if (p->vrf_set)
		cli_msg(-1006, " VRF: %s", p->vrf ? p->vrf->name : "default");

		if (p->proto->show_proto_info)
		p->proto->show_proto_info(p);

nest/protocol.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ struct proto_config {
		int class; /* SYM_PROTO or SYM_TEMPLATE */
		u8 net_type; /* Protocol network type (NET_), 0 for undefined /
		u8 disabled; /* Protocol enabled/disabled by default */
		u8 vrf_set; /* Related VRF instance (below) is defined */
		u32 debug, mrtdump; /* Debugging bitfields, both use D_* constants */
		u32 router_id; /* Protocol specific router ID */

		@@ -176,6 +177,7 @@ struct proto {
		uint active_channels; /* Number of active channels */
		byte net_type; /* Protocol network type (NET_), 0 for undefined /
		byte disabled; /* Manually disabled */
		byte vrf_set; /* Related VRF instance (above) is defined */
		byte proto_state; /* Protocol state machine (PS_, see below) /
		byte active; /* From PS_START to cleanup after PS_STOP */
		byte do_start; /* Start actions are scheduled */

Admin message