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

Merge commit 'origin/master' into new

Browse source
This commit is contained in:
Ondrej Zajicek 2010-02-21 10:15:49 +01:00
commit 9e43ccf07b
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
doc/bird.conf.example
View file

@ -96,9 +96,9 @@ protocol static {
# honor neighbor; # To whom do we agree to send the routing table # honor neighbor; # To whom do we agree to send the routing table
# honor always; # honor always;
# honor never; # honor never;
# passwords { password "ahoj" from 0 to 10; # passwords {
# password "nazdar" from 10; # password "nazdar";
# } # };
# authentication none; # authentication none;
# import filter { print "importing"; accept; }; # import filter { print "importing"; accept; };
# export filter { print "exporting"; accept; }; # export filter { print "exporting"; accept; };
@ -143,6 +143,7 @@ protocol static {
# generate from "22-04-2003 11:00:07"; # generate from "22-04-2003 11:00:07";
# accept from "17-01-2003 12:01:05"; # accept from "17-01-2003 12:01:05";
# }; # };
# };
# authentication cryptographic; # authentication cryptographic;
# }; # };
# }; # };
@ -163,7 +164,7 @@ protocol static {
#protocol bgp { #protocol bgp {
# disabled; # disabled;
# description "My BGP uplink" # description "My BGP uplink";
# local as 65000; # local as 65000;
# neighbor 62.168.0.130 as 5588; # neighbor 62.168.0.130 as 5588;
# multihop 20 via 62.168.0.13; # 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_med 0; # MED value we use for comparison when none is defined
# default bgp_local_pref 0; # The same for local preference # 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 # 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 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 where source=RTS_STATIC;
# export filter { # export filter {
# if source = RTS_STATIC then { # if source = RTS_STATIC then {
## bgp_community = -empty-; bgp_community = add(bgp_community,(65000,5678)); # bgp_community = -empty-; bgp_community = add(bgp_community,(65000,5678));
## bgp_origin = 0; # bgp_origin = 0;
# bgp_community = -empty-; bgp_community.add((65000,5678)); # bgp_community = -empty-; bgp_community.add((65000,5678));
## if (65000,5678) ~ bgp_community then # if (65000,5678) ~ bgp_community then
## bgp_community.add((0, 1)); # bgp_community.add((0, 1));
# if bgp_path ~ [= 65000 =] then # if bgp_path ~ [= 65000 =] then
# bgp_path.prepend(65000); # bgp_path.prepend(65000);
# accept; # accept;

2
proto/bgp/config.Y
View file

@ -59,7 +59,7 @@ bgp_proto:
BGP_CFG->remote_ip = $3; BGP_CFG->remote_ip = $3;
BGP_CFG->remote_as = $5; 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 RR CLIENT ';' { BGP_CFG->rr_client = 1; }
| bgp_proto RS CLIENT ';' { BGP_CFG->rs_client = 1; } | bgp_proto RS CLIENT ';' { BGP_CFG->rs_client = 1; }
| bgp_proto HOLD TIME expr ';' { BGP_CFG->hold_time = $4; } | bgp_proto HOLD TIME expr ';' { BGP_CFG->hold_time = $4; }