From 37f85b2af3e0c9697974c16c9c660eb67cce087e Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sun, 27 Jan 2019 16:34:27 +0000 Subject: [PATCH] Format fixes --- README.md | 27 +++++++++++++++------------ server/bird/bird.conf | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 295ceb5..dc6a912 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,27 @@ # Global Route Collector -The global route collector is a common resource for collecting route data from across the DN42 network. This data can then be used to provide statistics and a global map of the DN42 network. +The global route collector is a common resource for collecting route data from across the DN42 network. +This data can then be used to provide statistics and a global map of the DN42 network. ## Providing Routes to the Collector All DN42 users are invited to provide routes to the collector; the more users that take part, the more useful the collector becomes. -1. Contact burble@hackint or mail dn42@burble.com, including your AS number and BGP peer address(es) +- Contact burble@hackint or mail dn42@burble.com, including your AS number and BGP peer address(es) - The collector runs bird2 and supports multiprotocol BGP; the preference is for multiprotocol peering over IPv6. - If you can't support multiprotocol BGP, please provide both IPv4 and IPv6 peer addresses. +The collector runs bird2 and supports multiprotocol BGP; the preference is for multiprotocol peering over IPv6. +If you are unable to support multiprotocol BGP, please provide both IPv4 and IPv6 peer addresses. -2. Configure a BGP session for the collector on your router. +- Configure a BGP session for the collector on your router. + +Some example client configurations are included in the 'examples' directory. +Users are encouraged to configure the [BGP Add-Path](https://tools.ietf.org/html/rfc7911) extension to provide a comprehensive set of routes to the collector. - Some example client configurations are included in the 'examples' directory. - Users are encouraged to configure the [BGP Add-Path](https://tools.ietf.org/html/rfc7911) extension to provide a comprehensive set of routes to the collector. - -3. Profit ! - - ## Route Collector Services ### Looking Glass -[http://collector.dn42:5001/](http://collector.dn42:5001/) (DN42 link) +[http://collector.dn42:5001/](http://collector.dn42:5001/) (DN42 link) [https://grc.burble.com/](https://grc.burble.com/) (public internet link) The burble.dn42 looking glass is based on [bird-lg](https://github.com/sileht/bird-lg) with @@ -35,3 +33,8 @@ to fix formating and bird2 compatibility. [http://collector.dn42:9324/metrics](http://collector.dn42:9324/metrics) The collector runs [bird_exporter](https://github.com/czerwonk/bird_exporter) and the metrics are publically available on the default bird_exporter port. + +### Downstream BGP Sessions + +Contact dn42@burble.com if you would like a downstream BGP session for your own analysis or metrics. + diff --git a/server/bird/bird.conf b/server/bird/bird.conf index d08b23c..b519633 100644 --- a/server/bird/bird.conf +++ b/server/bird/bird.conf @@ -51,7 +51,7 @@ function rc_peer_import6(int peer_as; int peer_ref) { # accept valid networks if net ~ [ - fd00::/8{44,64} + fd00::/8+ ] then { bgp_large_community.add(( GRC_AS, peer_as, peer_ref ));