gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-13 08:34:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

removed bad check for extra comma, added comment for relay handling of address6 later

Browse source
This commit is contained in:
0xdcarns 2022-04-28 09:26:13 -04:00
parent 9b35b74a7b
commit 8a914d48e4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/ext_client.go
View file

@ -153,7 +153,7 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
} }
gwendpoint := gwnode.Endpoint + ":" + strconv.Itoa(int(gwnode.ListenPort)) gwendpoint := gwnode.Endpoint + ":" + strconv.Itoa(int(gwnode.ListenPort))
newAllowedIPs := network.AddressRange newAllowedIPs := network.AddressRange
if newAllowedIPs != "" { if newAllowedIPs != "" && network.AddressRange6 != "" {
newAllowedIPs += "," newAllowedIPs += ","
} }
if network.AddressRange6 != "" { if network.AddressRange6 != "" {

4
logic/peers.go
View file

@ -83,7 +83,7 @@ func GetNodePeers(network *models.Network, nodeid string, excludeRelayed bool, i
if node.UDPHolePunch == "yes" && node.IsStatic != "yes" && peer.ListenPort == node.ListenPort { if node.UDPHolePunch == "yes" && node.IsStatic != "yes" && peer.ListenPort == node.ListenPort {
peer.ListenPort = node.LocalListenPort peer.ListenPort = node.LocalListenPort
} }
if node.IsRelay == "yes" { if node.IsRelay == "yes" { // TODO, check if addressrange6 needs to be appended
peer.AllowedIPs = append(peer.AllowedIPs, network.AddressRange) peer.AllowedIPs = append(peer.AllowedIPs, network.AddressRange)
for _, egressNode := range egressNetworkNodes { for _, egressNode := range egressNetworkNodes {
if egressNode.IsRelayed == "yes" && StringSliceContains(node.RelayAddrs, egressNode.Address) { if egressNode.IsRelayed == "yes" && StringSliceContains(node.RelayAddrs, egressNode.Address) {
@ -139,7 +139,7 @@ func GetPeersList(refnode *models.Node) ([]models.Node, error) {
if relayNode.Address != "" { if relayNode.Address != "" {
var peerNode = setPeerInfo(&relayNode) var peerNode = setPeerInfo(&relayNode)
network, err := GetNetwork(networkName) network, err := GetNetwork(networkName)
if err == nil { if err == nil { // TODO: check if addressrange6 needs to be appended
peerNode.AllowedIPs = append(peerNode.AllowedIPs, network.AddressRange) peerNode.AllowedIPs = append(peerNode.AllowedIPs, network.AddressRange)
var _, egressNetworkNodes, err = getNetworkEgressAndNodes(networkName) var _, egressNetworkNodes, err = getNetworkEgressAndNodes(networkName)
if err == nil { if err == nil {