diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2022-12-13 19:31:46 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2023-08-25 23:50:44 +0200 |
| commit | f5140d1027f514bc59d46ab8aa09181f5870afbd (patch) | |
| tree | 0af416202ebde1828b3d0c2684061d600234142b /proto | |
| parent | cce48c6cdd9484c606879ea76d4c633fce12ba36 (diff) | |
Conf: Allow keywords to be redefined by user symbols
Most syntactic constructs in BIRD configuration (e.g. protocol options)
are defined as keywords, which are distinct from symbols (user-defined
names for protocols, variables, ...). That may cause backwards
compatibility issue when a new feature is added, as it may collide with
existing user names.
We can allow keywords to be shadowed by symbols in almost all cases to
avoid this issue.
This replaces the previous mechanism, where shadowable symbols have to be
explictly added to kw_syms.
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/config.Y | 3 | ||||
| -rw-r--r-- | proto/ospf/config.Y | 3 | ||||
| -rw-r--r-- | proto/radv/config.Y | 2 | ||||
| -rw-r--r-- | proto/rip/config.Y | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 218e0d04..ba50446a 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -45,9 +45,6 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER, CF_GRAMMAR -/* Workaround for collisions between keywords and symbols */ -kw_sym: ROLE | PEER | PROVIDER | CUSTOMER | RS_SERVER | RS_CLIENT ; - proto: bgp_proto '}' ; bgp_proto_start: proto_start BGP { diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 4b7d5a36..cfde3a5d 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -190,7 +190,8 @@ ospf_check_auth(void) CF_DECLS -CF_KEYWORDS(OSPF, V2, V3, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID) +CF_KEYWORDS_EXCLUSIVE(V2, V3) +CF_KEYWORDS(OSPF, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID) CF_KEYWORDS(AREA, NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT) CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP) diff --git a/proto/radv/config.Y b/proto/radv/config.Y index 9c5e1761..c57752d9 100644 --- a/proto/radv/config.Y +++ b/proto/radv/config.Y @@ -50,8 +50,6 @@ CF_ENUM(T_ENUM_RA_PREFERENCE, RA_PREF_, LOW, MEDIUM, HIGH) CF_GRAMMAR -kw_sym: CUSTOM | OPTION | VALUE ; - proto: radv_proto ; radv_proto_start: proto_start RADV diff --git a/proto/rip/config.Y b/proto/rip/config.Y index 28ee9609..1fab4527 100644 --- a/proto/rip/config.Y +++ b/proto/rip/config.Y @@ -32,7 +32,8 @@ rip_check_auth(void) CF_DECLS -CF_KEYWORDS(RIP, NG, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT, +CF_KEYWORDS_EXCLUSIVE(NG) +CF_KEYWORDS(RIP, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT, GARBAGE, RETRANSMIT, PORT, ADDRESS, MODE, BROADCAST, MULTICAST, PASSIVE, VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, TIME, BFD, AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, |