Mirrors/birdwatcher
1
0
Fork 0
mirror of https://github.com/alice-lg/birdwatcher.git synced 2025-03-09 00:00:05 +01:00
Code Issues Releases Wiki Activity

added bird cmd (fixes #1)

Browse source
This commit is contained in:
hellerve 2016-11-11 16:00:36 +01:00
parent 07a02dcc24
commit 4c0a82417f
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bird/bird.go
View file

@ -5,10 +5,12 @@ import (
"strings"
)
var BirdCmd string
func Run(args string) ([]byte, error) {
args = "show " + args
argsList := strings.Split(args, " ")
return exec.Command("birdc", argsList...).Output()
return exec.Command(BirdCmd, argsList...).Output()
}
func RunAndParse(cmd string, parser func([]byte) Parsed) Parsed {

2
bird/parser.go
View file

@ -116,7 +116,7 @@ func mainRouteDetail(groups []string, route Parsed) Parsed {
route["age"] = groups[5]
route["learnt_from"] = groups[6]
route["primary"] = groups[7] == "*"
route["metric"] = parseInt(groups[8])
route["metric"] = parseInt(groups[8])
return route
}

6
birdwatcher.go
View file

@ -7,6 +7,7 @@ import (
"strings"
"github.com/julienschmidt/httprouter"
"github.com/mchackorg/birdwatcher/bird"
"github.com/mchackorg/birdwatcher/endpoints"
)
@ -31,8 +32,13 @@ func main() {
port := flag.String("port",
"29184",
"The port the birdwatcher should run on")
birdc := flag.String("birdc",
"birdc",
"The birdc command to use (for IPv6, use birdc6)")
flag.Parse()
bird.BirdCmd = *birdc
r := makeRouter()
realPort := strings.Join([]string{":", *port}, "")