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

Merge branch 'develop' into metadata

Browse Source
This commit is contained in:
Neil Alexander 2018-12-15 11:59:41 +00:00
commit 5417e33520
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/yggdrasil/main.go
View File

@ -191,7 +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 {
for index, peer := range peers {
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
@ -201,8 +202,10 @@ func main() {
} }
(dat["Peers"].([]interface{}))[index] = "tcp://" + uri (dat["Peers"].([]interface{}))[index] = "tcp://" + uri
} }
}
// Now do the same with the interface peers // Now do the same with the interface peers
for intf, peers := range dat["InterfacePeers"].(map[string]interface{}) { if interfacepeers, ok := dat["InterfacePeers"].(map[string]interface{}); ok {
for intf, peers := range interfacepeers {
for index, peer := range peers.([]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://") {
@ -214,6 +217,7 @@ func main() {
((dat["InterfacePeers"].(map[string]interface{}))[intf]).([]interface{})[index] = "tcp://" + uri ((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
// we generated above. // we generated above.
if err = mapstructure.Decode(dat, &cfg); err != nil { if err = mapstructure.Decode(dat, &cfg); err != nil {