summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/confbase.Y7
-rw-r--r--proto/babel/config.Y5
-rw-r--r--proto/ospf/config.Y6
3 files changed, 9 insertions, 9 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 96b32028..9c08a41a 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -77,7 +77,7 @@ CF_DECLS
%type <time> datetime
%type <a> ipa
%type <px> prefix prefix_or_ipa
-%type <t> text
+%type <t> text opttext
%type <t> text_or_none
%nonassoc PREFIX_DUMMY
@@ -200,6 +200,11 @@ text:
}
;
+opttext:
+ TEXT
+ | /* empty */ { $$ = NULL; }
+ ;
+
text_or_none:
TEXT { $$ = $1; }
| { $$ = NULL; }
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 <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); })