From 2d6d4b80539be13aa53c6751fb33689b263e4010 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Wed, 7 Mar 2018 17:35:24 +0100 Subject: Babel: Fix build with restricted protocol set All keywords used in Babel config have to be declared locally. Thanks to Leo Vandewoestijne for the bugreport. --- proto/babel/config.Y | 5 +++-- proto/ospf/config.Y | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'proto') diff --git a/proto/babel/config.Y b/proto/babel/config.Y index b6170852..dcc0847e 100644 --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@ -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 diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 7b35b191..46b8b238 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -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 opttext %type lsadb_args %type 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); }) -- cgit v1.2.3