diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2010-02-21 10:15:49 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2010-02-21 10:15:49 +0100 |
| commit | 9e43ccf07b96597ef098955a07383d826938cd2d (patch) | |
| tree | 322e86a3915729a21474adc636db5825507d766a | |
| parent | e285bd236e9cd42e3f92db3a35b5ec2d307c7a48 (diff) | |
| parent | 89534cdae500cc82d9081088be90013e4121542d (diff) | |
Merge commit 'origin/master' into new
| -rw-r--r-- | doc/bird.conf.example | 21 | ||||
| -rw-r--r-- | proto/bgp/config.Y | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/doc/bird.conf.example b/doc/bird.conf.example index 51b2c0ec..c7105120 100644 --- a/doc/bird.conf.example +++ b/doc/bird.conf.example @@ -96,9 +96,9 @@ protocol static { # honor neighbor; # To whom do we agree to send the routing table # honor always; # honor never; -# passwords { password "ahoj" from 0 to 10; -# password "nazdar" from 10; -# } +# passwords { +# password "nazdar"; +# }; # authentication none; # import filter { print "importing"; accept; }; # export filter { print "exporting"; accept; }; @@ -143,6 +143,7 @@ protocol static { # generate from "22-04-2003 11:00:07"; # accept from "17-01-2003 12:01:05"; # }; +# }; # authentication cryptographic; # }; # }; @@ -163,7 +164,7 @@ protocol static { #protocol bgp { # disabled; -# description "My BGP uplink" +# description "My BGP uplink"; # local as 65000; # neighbor 62.168.0.130 as 5588; # multihop 20 via 62.168.0.13; @@ -181,17 +182,17 @@ protocol static { # default bgp_med 0; # MED value we use for comparison when none is defined # default bgp_local_pref 0; # The same for local preference # source address 62.168.0.14; # What local address we use for the TCP connection -# password "secret" # Password used for MD5 authentication +# password "secret"; # Password used for MD5 authentication # rr client; # I am a route reflector and the neighor is my client -# rr cluster id 1.0.0.1 # Use this value for cluster id instead of my router id +# rr cluster id 1.0.0.1; # Use this value for cluster id instead of my router id # export where source=RTS_STATIC; # export filter { # if source = RTS_STATIC then { -## bgp_community = -empty-; bgp_community = add(bgp_community,(65000,5678)); -## bgp_origin = 0; +# bgp_community = -empty-; bgp_community = add(bgp_community,(65000,5678)); +# bgp_origin = 0; # bgp_community = -empty-; bgp_community.add((65000,5678)); -## if (65000,5678) ~ bgp_community then -## bgp_community.add((0, 1)); +# if (65000,5678) ~ bgp_community then +# bgp_community.add((0, 1)); # if bgp_path ~ [= 65000 =] then # bgp_path.prepend(65000); # accept; diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 095e1cec..f882aaa5 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -59,7 +59,7 @@ bgp_proto: BGP_CFG->remote_ip = $3; BGP_CFG->remote_as = $5; } - | bgp_proto RR CLUSTER ID expr ';' { BGP_CFG->rr_cluster_id = $5; } + | bgp_proto RR CLUSTER ID idval ';' { BGP_CFG->rr_cluster_id = $5; } | bgp_proto RR CLIENT ';' { BGP_CFG->rr_client = 1; } | bgp_proto RS CLIENT ';' { BGP_CFG->rs_client = 1; } | bgp_proto HOLD TIME expr ';' { BGP_CFG->hold_time = $4; } |