diff --git a/README.md b/README.md
index 76c4b3f..fb160d2 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,6 @@ Features implemented:
- Query route (`show route for ...`, `show route where net ~ [ ... ]`)
- Whois and traceroute
- Work with both Python proxy (lgproxy.py) and Go proxy (proxy dir of this project)
-
-Features not implemented yet:
-
- Visualize AS paths as picture (bgpmap feature)
Usage: all configuration is done via commandline parameters or environment variables, no config file.
@@ -33,15 +30,16 @@ Example: the following command starts the frontend with 2 BIRD nodes, with domai
Example: the following docker-compose.yml entry does the same as above, but by starting a Docker container:
- bird-lg:
- image: xddxdd/bird-lg-go
- container_name: bird-lg
- restart: always
- environment:
- - BIRDLG_SERVERS=gigsgigscloud,hostdare
- - BIRDLG_DOMAIN=dn42.lantian.pub
- ports:
- - "5000:5000"
+ services:
+ bird-lg:
+ image: xddxdd/bird-lg-go
+ container_name: bird-lg
+ restart: always
+ environment:
+ - BIRDLG_SERVERS=gigsgigscloud,hostdare
+ - BIRDLG_DOMAIN=dn42.lantian.pub
+ ports:
+ - "5000:5000"
Demo: https://lg.lantian.pub
@@ -66,7 +64,7 @@ Usage: all configuration is done via commandline parameters or environment varia
- --bird6 / BIRD6_SOCKET: socket file for bird6, set either in parameter or environment variable BIRD6_SOCKET (default "/var/run/bird/bird6.ctl")
- --listen / BIRDLG_LISTEN: listen address, set either in parameter or environment variable BIRDLG_LISTEN (default ":8000")
-Example: start proxy with default configuration, should work "out of the box" on Debian 9:
+Example: start proxy with default configuration, should work "out of the box" on Debian 9 with BIRDv1:
./proxy
diff --git a/frontend/bgpmap.go b/frontend/bgpmap.go
new file mode 100644
index 0000000..c278602
--- /dev/null
+++ b/frontend/bgpmap.go
@@ -0,0 +1,78 @@
+package main
+
+import (
+ "sort"
+ "strings"
+)
+
+func birdRouteToGraphviz(servers []string, responses []string, target string) string {
+ var edges string
+ edges += "\"Target: " + target + "\" [color=red,shape=diamond];\n"
+ for serverID, server := range servers {
+ response := responses[serverID]
+ if len(response) == 0 {
+ continue
+ }
+ edges += "\"" + server + "\" [color=blue,shape=box];\n"
+ routes := strings.Split(response, "\tvia ")
+ for routeIndex, route := range routes {
+ var routeNexthop string
+ var routeASPath string
+ var routePreferred bool = routeIndex > 0 && strings.Contains(routes[routeIndex-1], "*")
+ // Have to look at previous slice to determine if route is preferred, due to bad split point selection
+
+ for _, routeParameter := range strings.Split(route, "\n") {
+ if strings.HasPrefix(routeParameter, "\tBGP.next_hop: ") {
+ routeNexthop = strings.TrimPrefix(routeParameter, "\tBGP.next_hop: ")
+ } else if strings.HasPrefix(routeParameter, "\tBGP.as_path: ") {
+ routeASPath = strings.TrimPrefix(routeParameter, "\tBGP.as_path: ")
+ }
+ }
+ if len(routeNexthop) == 0 || len(routeASPath) == 0 {
+ continue
+ }
+
+ // Connect each node on AS path
+ paths := strings.Split(strings.TrimSpace(routeASPath), " ")
+
+ // First step starting from originating server
+ if len(paths) > 0 {
+ if len(routeNexthop) > 0 {
+ // Edge from originating server to nexthop
+ edges += "\"" + server + "\" -> \"Nexthop:\\n" + routeNexthop + "\"" + (map[bool]string{true: " [color=red]"})[routePreferred] + ";\n"
+ // and from nexthop to AS
+ edges += "\"Nexthop:\\n" + routeNexthop + "\" -> \"AS" + paths[0] + "\"" + (map[bool]string{true: " [color=red]"})[routePreferred] + ";\n"
+ edges += "\"Nexthop:\\n" + routeNexthop + "\" [shape=diamond];\n"
+ } else {
+ // Edge from originating server to AS
+ edges += "\"" + server + "\" -> \"AS" + paths[0] + "\"" + (map[bool]string{true: " [color=red]"})[routePreferred] + ";\n"
+ }
+ }
+
+ // Following steps, edges between AS
+ for pathIndex := range paths {
+ if pathIndex == 0 {
+ continue
+ }
+ edges += "\"AS" + paths[pathIndex-1] + "\" -> \"AS" + paths[pathIndex] + "\"" + (map[bool]string{true: " [color=red]"})[routePreferred] + ";\n"
+ }
+ // Last AS to destination
+ edges += "\"AS" + paths[len(paths)-1] + "\" -> \"Target: " + target + "\"" + (map[bool]string{true: " [color=red]"})[routePreferred] + ";\n"
+ }
+ if !strings.Contains(edges, "\""+server+"\" ->") {
+ // Cannot get path information from bird
+ edges += "\"" + server + "\" -> \"Target: " + target + "\" [color=gray,label=\"?\"]"
+ }
+ }
+ // Deduplication of edges: sort, then remove if current entry is prefix of next entry
+ var result string
+ edgesSorted := strings.Split(edges, ";\n")
+ sort.Strings(edgesSorted)
+ for edgeIndex, edge := range edgesSorted {
+ if edgeIndex >= len(edgesSorted)-1 || !strings.HasPrefix(edgesSorted[edgeIndex+1], edge) {
+ result += edge + ";\n"
+ }
+ }
+
+ return "digraph {\n" + result + "}\n"
+}
diff --git a/frontend/template.go b/frontend/template.go
index bb2ba50..e3786a5 100644
--- a/frontend/template.go
+++ b/frontend/template.go
@@ -69,14 +69,27 @@ func templateHeader(w http.ResponseWriter, r *http.Request, title string) {
}
// Add the options in navbar form, and check if they are active
- var optionKeys = []string{"summary", "detail", "route", "route_all", "route_where", "route_where_all", "whois", "traceroute"}
+ var optionKeys = []string{
+ "summary",
+ "detail",
+ "route",
+ "route_all",
+ "route_bgpmap",
+ "route_where",
+ "route_where_all",
+ "route_where_bgpmap",
+ "whois",
+ "traceroute",
+ }
var optionDisplays = []string{
"show protocol",
"show protocol all",
"show route for ...",
"show route for ... all",
+ "show route for ... (bgpmap)",
"show route where net ~ [ ... ]",
"show route where net ~ [ ... ] all",
+ "show route where net ~ [ ... ] (bgpmap)",
"whois ...",
"traceroute ...",
}
@@ -109,7 +122,9 @@ func templateHeader(w http.ResponseWriter, r *http.Request, title string) {
` + title + `
-
+
+
+
@@ -143,6 +158,7 @@ func templateHeader(w http.ResponseWriter, r *http.Request, title string) {
func templateFooter(w http.ResponseWriter) {
w.Write([]byte(`
+