diff options
| author | Maria Matejka <mq@ucw.cz> | 2023-01-23 19:42:12 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2023-01-23 19:42:12 +0100 |
| commit | 4821612c94f9e935a6e841f6bcace9465dd2ad78 (patch) | |
| tree | 1ccce11dfb22df52ed05a59c60cc97bcfaddc607 /proto | |
| parent | 4e6cd1b2e354efb1df087a4296560b4b4b03fd7c (diff) | |
| parent | d1cd5e5a63b2256eb71661f7438537e4ded7b01a (diff) | |
Merge commit 'd1cd5e5a63b2256eb71661f7438537e4ded7b01a' into thread-next
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/config.Y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 0be50b5e..66d97e3b 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -31,7 +31,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, 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 @@ -44,6 +44,8 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER, CF_GRAMMAR +/* Workaround for collisions between keywords and symbols */ +toksym: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ; toksym: BGP_MED | BGP_LOCAL_PREF | SOURCE ; proto: bgp_proto '}' ; |