Babel: Fix build with restricted protocol set (2d6d4b80) · Commits · 戴 / Bird

conf/confbase.Y

+6 −1

+3 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,9 @@ CF_DEFINES

		CF_DECLS

		CF_KEYWORDS(BABEL, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, WIRED,
		WIRELESS, RX, TX, BUFFER, LENGTH, CHECK, LINK, BABEL_METRIC)
		CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
		TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
		BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, ENTRIES)

		CF_GRAMMAR

+0 −6

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY
		CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH)
		CF_KEYWORDS(SECONDARY, MERGE, LSA, SUPPRESSION)

		%type <t> opttext
		%type <ld> lsadb_args
		%type <i> nbma_eligible

		@@ -415,11 +414,6 @@ ospf_iface:
		ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); }
		;

		opttext:
		TEXT
		\| /* empty */ { $$ = NULL; }
		;

		CF_ADDTO(dynamic_attr, OSPF_METRIC1 { $$ = f_new_dynamic_attr(EAF_TYPE_INT \| EAF_TEMP, T_INT, EA_OSPF_METRIC1); })
		CF_ADDTO(dynamic_attr, OSPF_METRIC2 { $$ = f_new_dynamic_attr(EAF_TYPE_INT \| EAF_TEMP, T_INT, EA_OSPF_METRIC2); })
		CF_ADDTO(dynamic_attr, OSPF_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT \| EAF_TEMP, T_INT, EA_OSPF_TAG); })