ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

parse ip address in babel library correct

This commit is contained in:
Martin/Geno 2019-06-16 19:59:21 +02:00 committed by genofire
parent dd98f656d1
commit 6066963289
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
respond/daemon/neighbours.go
View File

@ -2,6 +2,7 @@ package respondd
import (
"errors"
"net"
"github.com/Vivena/babelweb2/parser"
@ -35,10 +36,10 @@ func (d *Daemon) updateNeighbours(iface string, resp *data.ResponseData) {
return nil
}
if t.Data["up"].(bool) {
addr := t.Data["ipv6"].(string)
addr := t.Data["ipv6"].(net.IP)
resp.Neighbours.Babel[string(t.Field)] = data.BabelNeighbours{
Protocol: "babel",
LinkLocalAddress: addr,
LinkLocalAddress: addr.String(),
Neighbours: make(map[string]data.BabelLink),
}
}
@ -53,7 +54,7 @@ func (d *Daemon) updateNeighbours(iface string, resp *data.ResponseData) {
if !ok {
return errors.New("neighbour without if")
}
addr, ok := t.Data["address"].(string)
addr, ok := t.Data["address"].(net.IP)
if !ok {
return errors.New("neighbour without address")
}
@ -63,7 +64,7 @@ func (d *Daemon) updateNeighbours(iface string, resp *data.ResponseData) {
TXCost: int(t.Data["txcost"].(uint64)),
Cost: int(t.Data["cost"].(uint64)),
}
bIfname.Neighbours[addr] = link
bIfname.Neighbours[addr.String()] = link
return nil
}
return errors.New("ifname not found during parsing")

3
respond/daemon/nodeinfo.go
View File

@ -102,7 +102,8 @@ func (d *Daemon) updateNodeinfo(iface string, resp *data.ResponseData) {
return nil
}
if t.Data["up"].(bool) {
addr := t.Data["ipv6"].(string)
addrIP := t.Data["ipv6"].(net.IP)
addr := addrIP.String()
meshBabel.Interfaces.Tunnel = append(meshBabel.Interfaces.Tunnel, addr)
resp.Nodeinfo.Network.Addresses = append(resp.Nodeinfo.Network.Addresses, addr)
}