summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2023-01-03 19:09:51 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2023-01-03 19:11:34 +0100
commitd1cd5e5a63b2256eb71661f7438537e4ded7b01a (patch)
tree81f2b36c52aa74a6cbaf0fa29b193639fc527510 /proto
parent309c874f9c8b217dbed1569c73b4a3035f5cb170 (diff)
BGP: Allow role specific keywords to be used as symbols
Some of these new BGP role keywords use generic names that collides with user-defined symbols. Allow them to be redefined. Also remove duplicit keyword definition for 'prefer'.
Diffstat (limited to 'proto')
-rw-r--r--proto/bgp/config.Y5
1 files changed, 4 insertions, 1 deletions
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 4e83147e..a2dfa747 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -32,7 +32,7 @@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, HOLD, TIME, CONNECT, RETRY, KEEPALIVE,
LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
- RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, PREFER, GLOBAL)
+ RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL)
%type <i> bgp_nh
%type <i32> bgp_afi
@@ -45,6 +45,9 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,
CF_GRAMMAR
+/* Workaround for collisions between keywords and symbols */
+symbol: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ;
+
proto: bgp_proto '}' ;
bgp_proto_start: proto_start BGP {