MPLS: Allowing MPLS stack route attribute and setup in static protocol (7da48a2f) · Commits · 戴 / Bird

conf/confbase.Y

+18 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ CF_HDR
		#include "lib/socket.h"
		#include "lib/timer.h"
		#include "lib/string.h"
		#include "lib/mpls.h"
		#include "nest/protocol.h"
		#include "nest/iface.h"
		#include "nest/route.h"
		@@ -44,6 +45,7 @@ CF_DECLS
		ip6_addr ip6;
		net_addr net;
		net_addr *net_ptr;
		struct mpls_stack *mpls;
		struct symbol *s;
		char *t;
		struct rtable_config *r;
		@@ -84,6 +86,7 @@ CF_DECLS
		%type <a> ipa
		%type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
		%type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_
		%type <mpls> mpls_stack_start mpls_stack

		%type <t> text opttext

		@@ -95,7 +98,7 @@ CF_DECLS
		%left '!'
		%nonassoc '.'

		CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US, PORT, VPN)
		CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US, PORT, VPN, MPLS)

		CF_GRAMMAR

		@@ -287,6 +290,20 @@ net_or_ipa:
		}
		;

		/* MPLS stack */

		mpls_stack_start: MPLS NUM
		{
		$$ = cfg_allocz(sizeof(struct mpls_stack));
		$$->len = 1;
		$$->label[0] = $2;
		};

		mpls_stack:
		mpls_stack_start
		\| mpls_stack '/' NUM { $1->label[$1->len++] = $3; $$ = $1; }
		;


		datetime:
		TEXT {

+1 −0

+3 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERE
		CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
		CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, NOEXPORT, GENERATE) /* ,ROA */
		CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION, SORTED)
		CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
		CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, MPLS_STACK, CLASS, DSCP)
		CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS)

		CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
		@@ -664,6 +664,8 @@ proto_patt2:
		CF_ADDTO(dynamic_attr, IGP_METRIC
		{ $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_GEN_IGP_METRIC); })

		CF_ADDTO(dynamic_attr, MPLS_STACK
		{ $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_GEN_MPLS_STACK); })

		CF_CODE

+1 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,7 @@ typedef struct eattr {
		#define EA_ID(ea) ((ea) & 0xff)

		#define EA_GEN_IGP_METRIC EA_CODE(EAP_GENERIC, 0)
		#define EA_GEN_MPLS_STACK EA_CODE(EAP_GENERIC, 1)

		#define EA_CODE_MASK 0xffff
		#define EA_ALLOW_UNDEF 0x10000 /* ea_find: allow EAF_TYPE_UNDEF */

+14 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,20 @@ get_generic_attr(eattr a, byte *buf, int buflen UNUSED)
		buf += bsprintf(buf, "igp_metric");
		return GA_NAME;
		}
		else if (a->id == EA_GEN_MPLS_STACK)
		{
		buf += bsprintf(buf, "mpls");
		struct adata *ad = a->u.ptr;
		u32 *z = ad->data;
		int len = ad->length / sizeof(u32);
		int i;

		buf += bsprintf(buf, " %d", z[0]);
		for (i = 1; i < len; i++)
		buf += bsprintf(buf, "/%d", z[i]);

		return GA_FULL;
		}

		return GA_UNKNOWN;
		}