Commit f3b33928 authored by Pavel Machek's avatar Pavel Machek

Tried to change garbagetime -> garbage time to be more consistent.

parent 24e1e200
......@@ -6,23 +6,7 @@
router id 62.168.0.1;
define xyzzy = 120+10;
protocol rip MyRIP_test {
debug all;
port 1520;
period 7;
garbagetime 60;
interface "*" { mode broadcast; };
honour neighbour;
# passwords { password "ahoj" from 0 to 10;
# password "nazdar" from 10;
# }
authentication none;
import filter { print "importing"; accept; };
export filter { print "exporting"; accept; };
}
define xyzzy = (120+10);
protocol device {
# disabled;
......@@ -42,6 +26,21 @@ protocol static {
# disabled;
import filter { print "ahoj";
print source;
if source = RTS_STATIC then {
print "It is from static";
}
print from;
from = 1.2.3.4;
print from;
print scope;
scope = SCOPE_HOST;
print scope;
preference = 15;
print preference;
preference = 29;
print preference;
rip_metric = 1;
print rip_metric;
rip_metric = rip_metric + 5;
......
......@@ -90,7 +90,7 @@ protocol static {
# port 1520;
# period 7;
# infinity 16;
# garbagetime 60;
# garbage time 60;
# interface "*" { mode broadcast; };
# honor neighbor; # To whom do we agree to send the routing table
# honor always;
......
......@@ -811,10 +811,10 @@ other than equally misconfigured BIRD. I warned you.
</tag>specifies number of seconds between periodic updates. Default is 30 seconds. Lower
number will mean faster convergence but bigger network load.
<tag>timeouttime <M>number</M>
<tag>timeout time <M>number</M>
</tag>specifies how old route has to be to be considered unreachable. Default is 4*period.
<tag>garbagetime <M>number</M>
<tag>garbage time <M>number</M>
</tag>specifies how old route has to be to be discarded. Default is 10*period.
</descrip>
......
......@@ -24,7 +24,7 @@ CF_DEFINES
CF_DECLS
CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, PASSWORDS,
CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGE, TIMEOUT, PASSWORDS,
MODE, BROADCAST, MULTICAST, QUIET, NOLISTEN, VERSION1,
AUTHENTICATION, NONE, PLAINTEXT, MD5,
HONOR, NEVER, NEIGHBOR, ALWAYS,
......@@ -48,7 +48,8 @@ rip_cfg:
| rip_cfg INFINITY expr ';' { RIP_CFG->infinity = $3; }
| rip_cfg PORT expr ';' { RIP_CFG->port = $3; }
| rip_cfg PERIOD expr ';' { RIP_CFG->period = $3; }
| rip_cfg GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; }
| rip_cfg GARBAGE TIME expr ';' { RIP_CFG->garbage_time = $4; }
| rip_cfg TIMEOUT TIME expr ';' { RIP_CFG->timeout_time = $4; }
| rip_cfg AUTHENTICATION rip_auth ';' {RIP_CFG->authtype = $3; }
| rip_cfg PASSWORDS '{' password_list '}' {RIP_CFG->passwords = $4; }
| rip_cfg HONOR ALWAYS ';' { RIP_CFG->honor = HO_ALWAYS; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment