Update OSPF and RIP protocol names and related documentation (da3cf9ea) · Commits · 戴 / Bird

doc/bird.sgml

+11 −8

Original line number	Diff line number	Diff line
		@@ -2795,14 +2795,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>;
		@@ -3728,10 +3729,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> {

proto/ospf/config.Y

+5 −5

Original line number	Diff line number	Diff line
		@@ -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)
		@@ -159,8 +159,8 @@ CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } )

		ospf_variant:
		OSPF { $$ = 1; }
		\| OSPF2 { $$ = 1; }
		\| OSPF3 { $$ = 0; }
		\| OSPF V2 { $$ = 1; }
		\| OSPF V3 { $$ = 0; }
		;

		ospf_proto_start: proto_start ospf_variant

proto/rip/config.Y

+3 −3

Original line number	Diff line number	Diff line
		@@ -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,

Admin message