yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-30 15:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update addPeer behavior and peer loop for URIs that may have transforms (like srv:// and txt://)

Browse source
This commit is contained in:
Neil Alexander 2019-03-26 19:15:59 +00:00
parent 246c60ae4d
commit a642c6009f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 123 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/yggdrasil/main.go
View file

@ -108,10 +108,13 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo
// Check to see if the peers are in a parsable format, if not then default
// them to the TCP scheme
if peers, ok := dat["Peers"].([]interface{}); ok {
peerloop:
for index, peer := range peers {
uri := peer.(string)
if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") {
continue
for _, prefix := range []string{"tcp://", "socks://", "srv://", "txt://"} {
if strings.HasPrefix(uri, prefix) {
continue peerloop
}
}
if strings.HasPrefix(uri, "tcp:") {
uri = uri[4:]
@ -121,11 +124,14 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo
}
// Now do the same with the interface peers
if interfacepeers, ok := dat["InterfacePeers"].(map[string]interface{}); ok {
interfacepeerloop:
for intf, peers := range interfacepeers {
for index, peer := range peers.([]interface{}) {
uri := peer.(string)
if strings.HasPrefix(uri, "tcp://") || strings.HasPrefix(uri, "socks://") {
continue
for _, prefix := range []string{"tcp://", "socks://", "srv://", "txt://"} {
if strings.HasPrefix(uri, prefix) {
continue interfacepeerloop
}
}
if strings.HasPrefix(uri, "tcp:") {
uri = uri[4:]