diff options
| -rw-r--r-- | doc/bird.sgml | 19 | ||||
| -rw-r--r-- | proto/ospf/config.Y | 10 | ||||
| -rw-r--r-- | proto/rip/config.Y | 6 |
3 files changed, 19 insertions, 16 deletions
diff --git a/doc/bird.sgml b/doc/bird.sgml index b10b1a21..91c21eeb 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2816,14 +2816,15 @@ each router detects all changes. <sect1>Configuration <label id="ospf-config"> -<p>In the main part of configuration, there can be multiple definitions of OSPF -areas, each with a different id. These definitions includes many other switches -and multiple definitions of interfaces. Definition of interface may contain many -switches and constant definitions and list of neighbors on nonbroadcast -networks. +<p>First, the desired OSPF version can be specified by using <cf/ospf v2/ or +<cf/ospf v3/ as a protocol type. By default, OSPFv2 is used. In the main part of +configuration, there can be multiple definitions of OSPF areas, each with a +different id. These definitions includes many other switches and multiple +definitions of interfaces. Definition of interface may contain many switches and +constant definitions and list of neighbors on nonbroadcast networks. <code> -protocol ospf <name> { +protocol ospf [v2|v3] <name> { rfc1583compat <switch>; instance id <num>; stub router <switch>; @@ -3749,10 +3750,12 @@ pretty much obsolete. It is still usable on very small networks. <label id="rip-config"> <p>RIP configuration consists mainly of common protocol options and interface -definitions, most RIP options are interface specific. +definitions, most RIP options are interface specific. RIPng (RIP for IPv6) +protocol instance can be configured by using <cf/rip ng/ instead of just +<cf/rip/ as a protocol type. <code> -protocol rip [<name>] { +protocol rip [ng] [<name>] { infinity <number>; ecmp <switch> [limit <number>]; interface <interface pattern> { 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 |