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

diff --git a/bird.conf b/bird.conf
index 012da103967b5231a859d4a84456bc770047f05a..67445b349372111eda91b025be88de41443d2139 100644 (file)
--- a/bird.conf
+++ b/bird.conf
@@ -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;

diff --git a/doc/bird.conf.example b/doc/bird.conf.example
index f30ce8df258433f8f186f78c49030122cf3829fc..476d8a8fc12fdcb41b4aee7ed43136225300c55b 100644 (file)
--- a/doc/bird.conf.example
+++ b/doc/bird.conf.example
@@ -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;

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 58ef2dea89119dbdae673206c4987d40c5e1393d..c602519e5238307501ddb7cd7ddc0884d9d6cc40 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -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>
 

diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 54630ba754a8cfeb33fbd7587543bc89d105ac7e..00d68f7860ba69e03e36da90f1e6bf334cee8570 100644 (file)
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -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; }