From f2224a6db5f17f639917d2e0bbf2436cdc98a194 Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Tue, 29 Jan 2019 11:05:47 +0000 Subject: [PATCH] Updated configs and README --- README.md | 15 +++++++- examples/bird1/client.conf | 40 --------------------- examples/bird1/client4.conf | 35 +++++++++++++++++++ examples/bird1/client6.conf | 35 +++++++++++++++++++ examples/bird2/multiprotocol_client.conf | 44 ++++++++++++++++-------- 5 files changed, 114 insertions(+), 55 deletions(-) delete mode 100644 examples/bird1/client.conf create mode 100644 examples/bird1/client4.conf create mode 100644 examples/bird1/client6.conf diff --git a/README.md b/README.md index dc6a912..a1d4ab4 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,23 @@ Users are encouraged to configure the [BGP Add-Path](https://tools.ietf.org/html ## Route Collector Services +### Website + +[http://collector.dn42/](http://collector.dn42/) (DN42 link) +[https://grc.burble.com/](https://grc.burble.com/) (public internet link) + +In progress - the website will provide stats and a network map of the DN42 network. + +### birdc shell + +*ssh shell@collector.dn42* + +For command line interrogation of the route collector bird daemon via a birdc shell. + ### Looking Glass [http://collector.dn42:5001/](http://collector.dn42:5001/) (DN42 link) -[https://grc.burble.com/](https://grc.burble.com/) (public internet link) +[https://lg-grc.burble.com/](https://lg-grc.burble.com/) (public internet link) The burble.dn42 looking glass is based on [bird-lg](https://github.com/sileht/bird-lg) with patches by [Zhaofeng](https://github.com/zhaofengli/bird-lg) and [Burble](https://github.com/sesa-me/bird-lg) diff --git a/examples/bird1/client.conf b/examples/bird1/client.conf deleted file mode 100644 index 9b2cd31..0000000 --- a/examples/bird1/client.conf +++ /dev/null @@ -1,40 +0,0 @@ -########################################################################## -# -# Bird1 Route Collector Client Example -# -########################################################################## - -# IPv4 -protocol bgp ROUTE_COLLECTOR4 -{ - local as ***YOUR_AS***; - - neighbor 172.20.129.165 as 4242422602; - multihop; - - # import nothing, export everything - import none; - export all; - - # export multiple paths to same destination - add paths tx; -} - -# IPv6 -protocol bgp ROUTE_COLLECTOR6 -{ - local as ***YOUR_AS***; - - neighbor fd42:4242:2601:ac12::1 as 4242422602; - multihop; - - # import nothing, export everything - import none; - export all; - - # export multiple paths to same destination - add paths tx; -} - -########################################################################## -# end of file \ No newline at end of file diff --git a/examples/bird1/client4.conf b/examples/bird1/client4.conf new file mode 100644 index 0000000..3de8d5f --- /dev/null +++ b/examples/bird1/client4.conf @@ -0,0 +1,35 @@ +########################################################################## +# +# Bird1 Route Collector Client Example (IPv4) +# +# Based on the bird1 examples in the DN42 wiki +# https://wiki.dn42.us/howto/Bird +# +########################################################################## + +protocol bgp ROUTE_COLLECTOR4 +{ + local as ***YOUR_ASN***; + neighbor 172.20.129.165 as 4242422602; + + # enable multihop as the collector is not locally connected + multihop; + + # export all available paths to the collector + add paths tx; + + # import/export filters + import none; + export filter { + # export all valid routes + if ( is_valid_network() && source ~ [ RTS_STATIC, RTS_BGP ] ) + then { + accept; + } + reject; + }; + +} + +########################################################################## +# end of file \ No newline at end of file diff --git a/examples/bird1/client6.conf b/examples/bird1/client6.conf new file mode 100644 index 0000000..2781335 --- /dev/null +++ b/examples/bird1/client6.conf @@ -0,0 +1,35 @@ +########################################################################## +# +# Bird1 Route Collector Client Example (IPv6) +# +# Based on the bird1 examples in the DN42 wiki +# https://wiki.dn42.us/howto/Bird +# +########################################################################## + +protocol bgp ROUTE_COLLECTOR6 +{ + local as ***YOUR_ASN***; + neighbor fd42:4242:2601:ac12::1 as 4242422602; + + # enable multihop as the collector is not locally connected + multihop; + + # export all available paths to the collector + add paths tx; + + # import/export filters + import none; + export filter { + # export all valid routes + if ( is_valid_network() && source ~ [ RTS_STATIC, RTS_BGP ] ) + then { + accept; + } + reject; + }; + +} + +########################################################################## +# end of file \ No newline at end of file diff --git a/examples/bird2/multiprotocol_client.conf b/examples/bird2/multiprotocol_client.conf index 3137e88..d239b5a 100644 --- a/examples/bird2/multiprotocol_client.conf +++ b/examples/bird2/multiprotocol_client.conf @@ -2,33 +2,49 @@ # # Bird2 Multiprotocol Route Collector Client Example # +# Based on the bird2 examples in the DN42 wiki +# https://wiki.dn42.us/howto/Bird2 +# ########################################################################## protocol bgp ROUTE_COLLECTOR { - local as ***YOUR_AS***; - + local as ***YOUR_ASN***; neighbor fd42:4242:2601:ac12::1 as 4242422602; + + # enable multihop as the collector is not locally connected multihop; ipv4 { - - # import nothing, export everything - import none; - export all; - - # export multiple paths to same destination + # export all available paths to the collector add paths tx; + + # import/export filters + import none; + export filter { + # export all valid routes + if ( is_valid_network() && source ~ [ RTS_STATIC, RTS_BGP ] ) + then { + accept; + } + reject; + }; }; ipv6 { - - # import nothing, export everything - import none; - export all; - - # export multiple paths to same destination + # export all available paths to the collector add paths tx; + + # import/export filters + import none; + export filter { + # export all valid routes + if ( is_valid_network_v6() && source ~ [ RTS_STATIC, RTS_BGP ] ) + then { + accept; + } + reject; + }; }; }