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

refactor server routing

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-08-19 11:25:39 -04:00
parent f569830910
commit 184e5a66d9
4 changed files with 9 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
logic/server.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard"
"github.com/gravitl/netmaker/servercfg"
"golang.org/x/exp/slices"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
@@ -148,13 +148,13 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
return returnNode, err
}
peers, hasGateway, gateways, err := GetServerPeers(node)
peers, err := GetPeerUpdate(node)
if err != nil && !ncutils.IsEmptyRecord(err) {
logger.Log(1, "failed to retrieve peers")
return returnNode, err
}
err = initWireguard(node, privateKey, peers[:], hasGateway, gateways[:])
err = wireguard.InitWireguard(node, privateKey, peers.Peers, false)
if err != nil {
return returnNode, err
}
@@ -188,41 +188,6 @@ func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {
return serverPush(serverNode)
}
/**
* Below function needs major refactor
*
*/
// GetServerPeers - gets peers of server
func GetServerPeers(serverNode *models.Node) ([]wgtypes.PeerConfig, bool, []string, error) {
update, err := GetPeerUpdate(serverNode)
if err != nil {
return []wgtypes.PeerConfig{}, false, []string{}, err
}
// this is temporary code, should be removed by 0.14.4
// refactor server routing to use client-side routing code
var hasGateways = false
var gateways = []string{}
nodes, err := GetNetworkNodes(serverNode.Network)
if err == nil {
for _, node := range nodes {
//if egress ranges is internet (0.0.0.0/0 or ::/0) remove as don't want server to use internet gateway
if node.IsEgressGateway == "yes" && (slices.Contains(node.EgressGatewayRanges, "0.0.0.0/0") || slices.Contains(node.EgressGatewayRanges, "::/0")) {
logger.Log(0, "skipping internet gateway for server")
continue
}
if node.IsEgressGateway == "yes" && !IsLocalServer(&node) {
gateways = append(gateways, node.EgressGatewayRanges...)
}
}
hasGateways = len(gateways) > 0
}
// end temporary code
return update.Peers, hasGateways, gateways, nil
}
// == Private ==
func isDeleteError(err error) bool {