Freifunk-Troisdorf/yanic
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DRY up code

Browse Source
This commit is contained in:
Julian Kornberger 2016-03-20 12:09:32 +01:00
parent 97348afa75
commit 582270d516
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
models/graph.go
View File

@ -49,23 +49,10 @@ func (builder *GraphBuilder) readNodes(nodes map[string]*Node) {
// Fill mac->id map // Fill mac->id map
for sourceId, node := range nodes { for sourceId, node := range nodes {
if nodeinfo := node.Nodeinfo; nodeinfo != nil { if nodeinfo := node.Nodeinfo; nodeinfo != nil {
for _, sourceAddress := range nodeinfo.Network.Mesh.Bat0.Interfaces.Tunnel { interfaces := nodeinfo.Network.Mesh.Bat0.Interfaces
builder.macToID[sourceAddress] = sourceId addresses := append(append(interfaces.Other, interfaces.Tunnel...), interfaces.Wireless...)
// is VPN address? for _, sourceAddress := range addresses {
if _, found := builder.vpn[sourceAddress]; found {
builder.vpn[sourceId] = nil
}
}
for _, sourceAddress := range nodeinfo.Network.Mesh.Bat0.Interfaces.Wireless {
builder.macToID[sourceAddress] = sourceId
// is VPN address?
if _, found := builder.vpn[sourceAddress]; found {
builder.vpn[sourceId] = nil
}
}
for _, sourceAddress := range nodeinfo.Network.Mesh.Bat0.Interfaces.Other {
builder.macToID[sourceAddress] = sourceId builder.macToID[sourceAddress] = sourceId
// is VPN address? // is VPN address?
@ -111,7 +98,7 @@ func (builder *GraphBuilder) isVPN(ids ...string) bool {
} }
func (builder *GraphBuilder) addLink(targetId string, sourceId string, linkTq int) { func (builder *GraphBuilder) addLink(targetId string, sourceId string, linkTq int) {
// Order IDs to get generate the key // Sort IDs to generate the key
var key string var key string
if strings.Compare(sourceId, targetId) > 0 { if strings.Compare(sourceId, targetId) > 0 {
key = fmt.Sprintf("%s-%s", sourceId, targetId) key = fmt.Sprintf("%s-%s", sourceId, targetId)