Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update OSPF and RIP protocol names and related documentation

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2017-03-08 17:37:11 +01:00
parent 2be9218a3b
commit da3cf9eae3
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
doc/bird.sgml
View file

@ -2795,14 +2795,15 @@ each router detects all changes.
<sect1>Configuration <sect1>Configuration
<label id="ospf-config"> <label id="ospf-config">
<p>In the main part of configuration, there can be multiple definitions of OSPF <p>First, the desired OSPF version can be specified by using <cf/ospf v2/ or
areas, each with a different id. These definitions includes many other switches <cf/ospf v3/ as a protocol type. By default, OSPFv2 is used. In the main part of
and multiple definitions of interfaces. Definition of interface may contain many configuration, there can be multiple definitions of OSPF areas, each with a
switches and constant definitions and list of neighbors on nonbroadcast different id. These definitions includes many other switches and multiple
networks. definitions of interfaces. Definition of interface may contain many switches and
constant definitions and list of neighbors on nonbroadcast networks.
<code> <code>
protocol ospf &lt;name&gt; { protocol ospf [v2|v3] &lt;name&gt; {
rfc1583compat &lt;switch&gt;; rfc1583compat &lt;switch&gt;;
instance id &lt;num&gt;; instance id &lt;num&gt;;
stub router &lt;switch&gt;; stub router &lt;switch&gt;;
@ -3728,10 +3729,12 @@ pretty much obsolete. It is still usable on very small networks.
<label id="rip-config"> <label id="rip-config">
<p>RIP configuration consists mainly of common protocol options and interface <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> <code>
protocol rip [&lt;name&gt;] { protocol rip [ng] [&lt;name&gt;] {
infinity &lt;number&gt;; infinity &lt;number&gt;;
ecmp &lt;switch&gt; [limit &lt;number&gt;]; ecmp &lt;switch&gt; [limit &lt;number&gt;];
interface &lt;interface pattern&gt; { interface &lt;interface pattern&gt; {

10
proto/ospf/config.Y
View file

@ -139,8 +139,8 @@ ospf_check_auth(void)
CF_DECLS CF_DECLS
CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID) CF_KEYWORDS(OSPF, V2, V3, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, OSPF_ROUTER_ID)
CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT) CF_KEYWORDS(AREA, NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT)
CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT)
CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP) CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP)
CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY)
@ -158,9 +158,9 @@ CF_GRAMMAR
CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } ) CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } )
ospf_variant: ospf_variant:
OSPF { $$ = 1; } OSPF { $$ = 1; }
| OSPF2 { $$ = 1; } | OSPF V2 { $$ = 1; }
| OSPF3 { $$ = 0; } | OSPF V3 { $$ = 0; }
; ;
ospf_proto_start: proto_start ospf_variant ospf_proto_start: proto_start ospf_variant

6
proto/rip/config.Y
View file

@ -32,7 +32,7 @@ rip_check_auth(void)
CF_DECLS 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, GARBAGE, PORT, ADDRESS, MODE, BROADCAST, MULTICAST, PASSIVE,
VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, TIME, BFD, VERSION, SPLIT, HORIZON, POISON, REVERSE, CHECK, ZERO, TIME, BFD,
AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, TTL, SECURITY, AUTHENTICATION, NONE, PLAINTEXT, CRYPTOGRAPHIC, MD5, TTL, SECURITY,
@ -45,8 +45,8 @@ CF_GRAMMAR
CF_ADDTO(proto, rip_proto) CF_ADDTO(proto, rip_proto)
rip_variant: rip_variant:
RIP { $$ = 1; } RIP { $$ = 1; }
| RIPNG { $$ = 0; } | RIP NG { $$ = 0; }
; ;
rip_proto_start: proto_start rip_variant rip_proto_start: proto_start rip_variant