cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-26 07:11:40 +00:00
Code Releases Activity

Merge pull request #254 from neilalexander/fixpeers

Browse Source 
Fix panic if Peers or InterfacePeers is commented out
This commit is contained in:
Neil Alexander 2018-12-15 11:57:04 +00:00 committed by GitHub
commit 7faff70d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/yggdrasil/main.go
View File

@ -191,19 +191,8 @@ func main() {
} }
// Check to see if the peers are in a parsable format, if not then default // Check to see if the peers are in a parsable format, if not then default
// them to the TCP scheme // them to the TCP scheme
for index, peer := range dat["Peers"].([]interface{}) { if peers, ok := dat["Peers"].([]interface{}); ok {
uri := peer.(string) for index, peer := range peers {
if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") {
continue
}
if strings.HasPrefix(uri, "tcp:") {
uri = uri[4:]
}
(dat["Peers"].([]interface{}))[index] = "tcp://" + uri
}
// Now do the same with the interface peers
for intf, peers := range dat["InterfacePeers"].(map[string]interface{}) {
for index, peer := range peers.([]interface{}) {
uri := peer.(string) uri := peer.(string)
if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") { if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") {
continue continue
@ -211,7 +200,22 @@ func main() {
if strings.HasPrefix(uri, "tcp:") { if strings.HasPrefix(uri, "tcp:") {
uri = uri[4:] uri = uri[4:]
} }
((dat["InterfacePeers"].(map[string]interface{}))[intf]).([]interface{})[index] = "tcp://" + uri (dat["Peers"].([]interface{}))[index] = "tcp://" + uri
}
}
// Now do the same with the interface peers
if interfacepeers, ok := dat["InterfacePeers"].(map[string]interface{}); ok {
for intf, peers := range interfacepeers {
for index, peer := range peers.([]interface{}) {
uri := peer.(string)
if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") {
continue
}
if strings.HasPrefix(uri, "tcp:") {
uri = uri[4:]
}
((dat["InterfacePeers"].(map[string]interface{}))[intf]).([]interface{})[index] = "tcp://" + uri
}
} }
} }
// Overlay our newly mapped configuration onto the autoconf node config that // Overlay our newly mapped configuration onto the autoconf node config that