From 0ddace6fad53f6e9c7612773dbdb56f8f61ad274 Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Thu, 25 Jan 2018 11:13:40 +0100 Subject: [PATCH 1/4] fixed default ports --- etc/ecix/birdwatcher.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/ecix/birdwatcher.conf b/etc/ecix/birdwatcher.conf index ad5aab7..717ac85 100644 --- a/etc/ecix/birdwatcher.conf +++ b/etc/ecix/birdwatcher.conf @@ -42,13 +42,13 @@ requests_per_minute = 10 [bird] -listen = "0.0.0.0:29188" +listen = "0.0.0.0:29184" config = "/etc/bird.conf" birdc = "/sbin/birdc" [bird6] -listen = "0.0.0.0:29189" +listen = "0.0.0.0:29186" config = "/etc/bird6.conf" birdc = "/sbin/birdc6" From e7755afb611c71e60efd3e89dcd972191a09e56a Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Thu, 29 Nov 2018 15:20:35 +0100 Subject: [PATCH 2/4] moved repository (alice-lg) in import --- README.md | 6 +++--- birdwatcher.go | 4 ++-- config.go | 4 ++-- endpoints/endpoint.go | 2 +- endpoints/protocols.go | 2 +- endpoints/routes.go | 2 +- endpoints/status.go | 2 +- endpoints/symbols.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c7337c5..2196d51 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ regular binaries, which means deployment and maintenance might be more convenient. Our version also has a few more capabilities, as you will -discover when looking at [the modules section](https://github.com/ecix/birdwatcher/blob/master/etc/ecix/birdwatcher.conf) +discover when looking at [the modules section](https://github.com/alice-lg/birdwatcher/blob/master/etc/ecix/birdwatcher.conf) of the config. ## Installation @@ -135,11 +135,11 @@ We do not currently support other deployment methods. ## Configuration An example config with sane defaults is provided in -[etc/ecix/birdwatcher.conf](https://github.com/ecix/birdwatcher/blob/master/etc/ecix/birdwatcher.conf). +[etc/ecix/birdwatcher.conf](https://github.com/alice-lg/birdwatcher/blob/master/etc/ecix/birdwatcher.conf). You should be able to use it out of the box. If you need to change it, it is well-commented and hopefully intuitive. If you do not know how to configure it, please consider opening -[an issue](https://github.com/ecix/birdwatcher/issues/new). +[an issue](https://github.com/alice-lg/birdwatcher/issues/new). ## How diff --git a/birdwatcher.go b/birdwatcher.go index 71eb24b..358b3d3 100644 --- a/birdwatcher.go +++ b/birdwatcher.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/ecix/birdwatcher/bird" - "github.com/ecix/birdwatcher/endpoints" + "github.com/alice-lg/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/endpoints" "github.com/julienschmidt/httprouter" ) diff --git a/config.go b/config.go index 8a5c394..d4e5fda 100644 --- a/config.go +++ b/config.go @@ -10,8 +10,8 @@ import ( "github.com/BurntSushi/toml" "github.com/imdario/mergo" - "github.com/ecix/birdwatcher/bird" - "github.com/ecix/birdwatcher/endpoints" + "github.com/alice-lg/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/endpoints" ) type Config struct { diff --git a/endpoints/endpoint.go b/endpoints/endpoint.go index 50769c7..5ca4a04 100644 --- a/endpoints/endpoint.go +++ b/endpoints/endpoint.go @@ -10,7 +10,7 @@ import ( "encoding/json" "net/http" - "github.com/ecix/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/bird" "github.com/julienschmidt/httprouter" ) diff --git a/endpoints/protocols.go b/endpoints/protocols.go index cc1b30a..da04438 100644 --- a/endpoints/protocols.go +++ b/endpoints/protocols.go @@ -3,7 +3,7 @@ package endpoints import ( "net/http" - "github.com/ecix/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/bird" "github.com/julienschmidt/httprouter" ) diff --git a/endpoints/routes.go b/endpoints/routes.go index 1a17ffa..5aadcb5 100644 --- a/endpoints/routes.go +++ b/endpoints/routes.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/ecix/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/bird" "github.com/julienschmidt/httprouter" ) diff --git a/endpoints/status.go b/endpoints/status.go index ae9e5a5..fd18eb4 100644 --- a/endpoints/status.go +++ b/endpoints/status.go @@ -3,7 +3,7 @@ package endpoints import ( "net/http" - "github.com/ecix/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/bird" "github.com/julienschmidt/httprouter" ) diff --git a/endpoints/symbols.go b/endpoints/symbols.go index 4bcc15a..6a8d41d 100644 --- a/endpoints/symbols.go +++ b/endpoints/symbols.go @@ -3,7 +3,7 @@ package endpoints import ( "net/http" - "github.com/ecix/birdwatcher/bird" + "github.com/alice-lg/birdwatcher/bird" "github.com/julienschmidt/httprouter" ) From 2a17304682f3f4dbca46a69d3b651b462437290d Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Thu, 29 Nov 2018 15:28:00 +0100 Subject: [PATCH 3/4] fixed command syntax --- bird/bird.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bird/bird.go b/bird/bird.go index 2ba5956..2e7b9b9 100644 --- a/bird/bird.go +++ b/bird/bird.go @@ -200,7 +200,8 @@ func RoutesProtoCount(protocol string) (Parsed, bool) { } func RoutesFiltered(protocol string) (Parsed, bool) { - cmd := routeQueryForChannel("route all filtered " + protocol) + cmd := routeQueryForChannel("route filtered protocol '" + protocol + "' all") + return RunAndParse(cmd, parseRoutes) } @@ -221,7 +222,7 @@ func RoutesNoExport(protocol string) (Parsed, bool) { protocol[len(ParserConf.PeerProtocolPrefix):] } - cmd := routeQueryForChannel("route all noexport " + protocol) + cmd := routeQueryForChannel("route noexport '" + protocol + "' all") return RunAndParse(cmd, parseRoutes) } From 5872eeb5e8ad74b8ee36238fde4c00c9994130c8 Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Thu, 29 Nov 2018 15:28:19 +0100 Subject: [PATCH 4/4] version bump --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5ad2491..1cac385 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.2 +1.11.0