zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

added egress relayed addrs to relayed nodes

Browse Source
This commit is contained in:
0xdcarns
2022-01-03 11:30:02 -05:00
parent 40fcf78e31
commit dcaba24b11
2 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
logic/util.go
View File

@@ -184,26 +184,18 @@ func GetNode(macaddress string, network string) (models.Node, error) {
// GetNodePeers - fetches peers for a given node
func GetNodePeers(networkName string, excludeRelayed bool) ([]models.Node, error) {
var peers []models.Node
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
var networkNodes, egressNetworkNodes, err = getNetworkEgressAndNodes(networkName)
if err != nil {
if database.IsEmptyRecord(err) {
return peers, nil
}
logger.Log(2, err.Error())
return nil, err
return peers, nil
}
udppeers, errN := database.GetPeers(networkName)
if errN != nil {
logger.Log(2, errN.Error())
}
for _, value := range collection {
var node = &models.Node{}
for _, node := range networkNodes {
var peer = models.Node{}
err := json.Unmarshal([]byte(value), node)
if err != nil {
logger.Log(2, err.Error())
continue
}
if node.IsEgressGateway == "yes" { // handle egress stuff
peer.EgressGatewayRanges = node.EgressGatewayRanges
peer.IsEgressGateway = node.IsEgressGateway
@@ -211,7 +203,7 @@ func GetNodePeers(networkName string, excludeRelayed bool) ([]models.Node, error
allow := node.IsRelayed != "yes" || !excludeRelayed
if node.Network == networkName && node.IsPending != "yes" && allow {
peer = setPeerInfo(node)
peer = setPeerInfo(&node)
if node.UDPHolePunch == "yes" && errN == nil && CheckEndpoint(udppeers[node.PublicKey]) {
endpointstring := udppeers[node.PublicKey]
endpointarr := strings.Split(endpointstring, ":")
@@ -230,6 +222,11 @@ func GetNodePeers(networkName string, excludeRelayed bool) ([]models.Node, error
} else {
peer.AllowedIPs = append(peer.AllowedIPs, node.RelayAddrs...)
}
for _, egressNode := range egressNetworkNodes {
if egressNode.IsRelayed == "yes" && StringSliceContains(node.RelayAddrs, egressNode.Address) {
peer.AllowedIPs = append(peer.AllowedIPs, egressNode.EgressGatewayRanges...)
}
}
}
peers = append(peers, peer)
}
@@ -286,6 +283,34 @@ func RandomString(length int) string {
// == Private Methods ==
func getNetworkEgressAndNodes(networkName string) ([]models.Node, []models.Node, error) {
var networkNodes, egressNetworkNodes []models.Node
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil {
if database.IsEmptyRecord(err) {
return networkNodes, egressNetworkNodes, nil
}
logger.Log(2, err.Error())
return nil, nil, err
}
for _, value := range collection {
var node = models.Node{}
err := json.Unmarshal([]byte(value), &node)
if err != nil {
logger.Log(2, err.Error())
continue
}
if node.Network == networkName {
networkNodes = append(networkNodes, node)
if node.IsEgressGateway == "yes" {
egressNetworkNodes = append(egressNetworkNodes, node)
}
}
}
return networkNodes, egressNetworkNodes, nil
}
func setPeerInfo(node *models.Node) models.Node {
var peer models.Node
peer.RelayAddrs = node.RelayAddrs
@@ -326,3 +351,13 @@ func setIPForwardingLinux() error {
}
return nil
}
// StringSliceContains - sees if a string slice contains a string element
func StringSliceContains(slice []string, item string) bool {
for _, s := range slice {
if s == item {
return true
}
}
return false
}