burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

frontend: fix whois lookup & only show bgpmap nexthop info on the first hop

Browse Source
This commit is contained in:
Lan Tian 2023-05-05 20:20:12 -07:00
parent 5625058e71
commit 594ca80f50
No known key found for this signature in database
GPG Key ID: 04E66B6B25A0862B
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/asn_cache.go
View File

@ -9,9 +9,8 @@ import (
type ASNCache map[string]string
func (cache ASNCache) _lookup(asn string) string {
// Try to get ASN representation using DNS
if setting.dnsInterface != "" {
// get ASN representation using DNS
records, err := net.LookupTXT(fmt.Sprintf("AS%s.%s", asn, setting.dnsInterface))
if err == nil {
result := strings.Join(records, " ")
@ -20,8 +19,10 @@ func (cache ASNCache) _lookup(asn string) string {
}
return fmt.Sprintf("AS%s\n%s", asn, result)
}
} else if setting.whoisServer != "" {
// get ASN representation using WHOIS
}
// Try to get ASN representation using WHOIS
if setting.whoisServer != "" {
if setting.bgpmapInfo == "" {
setting.bgpmapInfo = "asn,as-name,ASName,descr"
}

6
frontend/bgpmap.go
View File

@ -90,14 +90,18 @@ func birdRouteToGraph(servers []string, responses []string, target string) Route
// Edges between AS
for i := range paths {
var src string
var label string
// Only show nexthop information on the first hop
if i == 0 {
src = server
label = strings.TrimSpace(protocolName + "\n" + via)
} else {
src = paths[i-1]
label = ""
}
dst := paths[i]
graph.AddEdge(src, dst, strings.TrimSpace(protocolName+"\n"+via), makeEdgeAttrs(routePreferred))
graph.AddEdge(src, dst, label, makeEdgeAttrs(routePreferred))
// Only set color for next step, origin color is set to blue above
graph.AddPoint(dst, true, makePointAttrs(routePreferred))
}

4
frontend/bgpmap_graph.go
View File

@ -89,7 +89,9 @@ func (graph *RouteGraph) AddEdge(src string, dest string, label string, attrs Ro
newValue = makeRouteEdgeValue()
}
newValue.label = append(newValue.label, label)
if len(label) != 0 {
newValue.label = append(newValue.label, label)
}
for k, v := range attrs {
newValue.attrs[k] = v
}