summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2017-03-08 17:37:11 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2017-03-08 17:37:11 +0100
commitda3cf9eae3085d43a2299bae63e6ceb3828856a5 (patch)
treeebd713a059737eeb18a56e0df1dbca7b20afed42 /proto
parent2be9218a3b1dfcc8e42c8d118e95f2074d9f7a7c (diff)
Update OSPF and RIP protocol names and related documentation
Diffstat (limited to 'proto')
-rw-r--r--proto/ospf/config.Y10
-rw-r--r--proto/rip/config.Y6
2 files changed, 8 insertions, 8 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 72928875..8a1e0052 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -139,8 +139,8 @@ ospf_check_auth(void)
CF_DECLS
-CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID)
-CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT)
+CF_KEYWORDS(OSPF, V2, V3, 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)
CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY)
@@ -158,9 +158,9 @@ CF_GRAMMAR
CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } )
ospf_variant:
- OSPF { $$ = 1; }
- | OSPF2 { $$ = 1; }
- | OSPF3 { $$ = 0; }
+ OSPF { $$ = 1; }
+ | OSPF V2 { $$ = 1; }
+ | OSPF V3 { $$ = 0; }
;
ospf_proto_start: proto_start ospf_variant
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index b3ccdf39..25c2ac7a 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -32,7 +32,7 @@ rip_check_auth(void)
CF_DECLS
-CF_KEYWORDS(RIP, RIPNG, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT,
+CF_KEYWORDS(RIP, NG, ECMP, LIMIT, WEIGHT, INFINITY, METRIC, UPDATE, TIMEOUT,
GARBAGE, PORT, ADDRESS, MODE, BROADCAST, MULTICAST, PASSIVE,
VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, TIME, BFD,
AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, TTL, SECURITY,
@@ -45,8 +45,8 @@ CF_GRAMMAR
CF_ADDTO(proto, rip_proto)
rip_variant:
- RIP { $$ = 1; }
- | RIPNG { $$ = 0; }
+ RIP { $$ = 1; }
+ | RIP NG { $$ = 0; }
;
rip_proto_start: proto_start rip_variant