gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

debug again

Browse source
This commit is contained in:
0xdcarns 2022-01-31 10:46:34 -05:00
parent 36b319c772
commit 4823566125
4 changed files with 75 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/node.go
View file

@ -12,6 +12,7 @@ import (
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mq" "github.com/gravitl/netmaker/mq"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/servercfg" "github.com/gravitl/netmaker/servercfg"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -586,7 +587,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
newNode.PostUp = node.PostUp newNode.PostUp = node.PostUp
} }
var shouldPeersUpdate = logic.IfaceDelta(&node, &newNode) var shouldPeersUpdate = ncutils.IfaceDelta(&node, &newNode)
err = logic.UpdateNode(&node, &newNode) err = logic.UpdateNode(&node, &newNode)
if err != nil { if err != nil {

3
controllers/node_grpc.go
View file

@ -11,6 +11,7 @@ import (
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mq" "github.com/gravitl/netmaker/mq"
"github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/servercfg" "github.com/gravitl/netmaker/servercfg"
) )
@ -129,7 +130,7 @@ func (s *NodeServiceServer) UpdateNode(ctx context.Context, req *nodepb.Object)
newnode.PostDown = node.PostDown newnode.PostDown = node.PostDown
newnode.PostUp = node.PostUp newnode.PostUp = node.PostUp
} }
var shouldPeersUpdate = logic.IfaceDelta(&node, &newnode) var shouldPeersUpdate = ncutils.IfaceDelta(&node, &newnode)
getServerAddrs(&node) getServerAddrs(&node)
err = logic.UpdateNode(&node, &newnode) err = logic.UpdateNode(&node, &newnode)
if err != nil { if err != nil {

106
logic/nodes.go
View file

@ -255,65 +255,65 @@ func CreateNode(node *models.Node) error {
} }
// IfaceDelta - is there interface changes // IfaceDelta - is there interface changes
func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool { // func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool {
SetNodeDefaults(newNode) // SetNodeDefaults(newNode)
// single comparison statements // // single comparison statements
if currentNode.IsServer != "yes" { // if currentNode.IsServer != "yes" {
return false // return false
} // }
if newNode.Endpoint != currentNode.Endpoint || // if newNode.Endpoint != currentNode.Endpoint ||
newNode.LocalAddress != currentNode.LocalAddress || // newNode.LocalAddress != currentNode.LocalAddress ||
newNode.PublicKey != currentNode.PublicKey || // newNode.PublicKey != currentNode.PublicKey ||
newNode.Address != currentNode.Address || // newNode.Address != currentNode.Address ||
newNode.IsEgressGateway != currentNode.IsEgressGateway || // newNode.IsEgressGateway != currentNode.IsEgressGateway ||
newNode.IsIngressGateway != currentNode.IsIngressGateway || // newNode.IsIngressGateway != currentNode.IsIngressGateway ||
newNode.IsRelay != currentNode.IsRelay || // newNode.IsRelay != currentNode.IsRelay ||
newNode.UDPHolePunch != currentNode.UDPHolePunch || // newNode.UDPHolePunch != currentNode.UDPHolePunch ||
newNode.IsPending != currentNode.IsPending || // newNode.IsPending != currentNode.IsPending ||
newNode.PersistentKeepalive != currentNode.PersistentKeepalive || // newNode.PersistentKeepalive != currentNode.PersistentKeepalive ||
len(newNode.ExcludedAddrs) != len(currentNode.ExcludedAddrs) || // len(newNode.ExcludedAddrs) != len(currentNode.ExcludedAddrs) ||
len(newNode.AllowedIPs) != len(currentNode.AllowedIPs) { // len(newNode.AllowedIPs) != len(currentNode.AllowedIPs) {
return true // return true
} // }
// multi-comparison statements // // multi-comparison statements
if newNode.IsDualStack == "yes" { // if newNode.IsDualStack == "yes" {
if newNode.Address6 != currentNode.Address6 { // if newNode.Address6 != currentNode.Address6 {
return true // return true
} // }
} // }
if newNode.IsEgressGateway == "yes" { // if newNode.IsEgressGateway == "yes" {
if len(currentNode.EgressGatewayRanges) != len(newNode.EgressGatewayRanges) { // if len(currentNode.EgressGatewayRanges) != len(newNode.EgressGatewayRanges) {
return true // return true
} // }
for _, address := range newNode.EgressGatewayRanges { // for _, address := range newNode.EgressGatewayRanges {
if !StringSliceContains(currentNode.EgressGatewayRanges, address) { // if !StringSliceContains(currentNode.EgressGatewayRanges, address) {
return true // return true
} // }
} // }
} // }
if newNode.IsRelay == "yes" { // if newNode.IsRelay == "yes" {
if len(currentNode.RelayAddrs) != len(newNode.RelayAddrs) { // if len(currentNode.RelayAddrs) != len(newNode.RelayAddrs) {
return true // return true
} // }
for _, address := range newNode.RelayAddrs { // for _, address := range newNode.RelayAddrs {
if !StringSliceContains(currentNode.RelayAddrs, address) { // if !StringSliceContains(currentNode.RelayAddrs, address) {
return true // return true
} // }
} // }
} // }
for _, address := range newNode.AllowedIPs { // for _, address := range newNode.AllowedIPs {
if !StringSliceContains(currentNode.AllowedIPs, address) { // if !StringSliceContains(currentNode.AllowedIPs, address) {
return true // return true
} // }
} // }
return false // return false
} // }
// GetAllNodes - returns all nodes in the DB // GetAllNodes - returns all nodes in the DB
func GetAllNodes() ([]models.Node, error) { func GetAllNodes() ([]models.Node, error) {

15
netclient/functions/daemon.go
View file

@ -181,6 +181,9 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
newNode.PullChanges = "no" newNode.PullChanges = "no"
//ensure that OS never changes //ensure that OS never changes
newNode.OS = runtime.GOOS newNode.OS = runtime.GOOS
// check if interface needs to delta
ifaceDelta := ncutils.IfaceDelta(&cfg.Node, &newNode)
cfg.Node = newNode cfg.Node = newNode
switch newNode.Action { switch newNode.Action {
case models.NODE_DELETE: case models.NODE_DELETE:
@ -214,12 +217,22 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
ncutils.Log("error updating wireguard config " + err.Error()) ncutils.Log("error updating wireguard config " + err.Error())
return return
} }
ncutils.Log("applyWGQuickConf to " + file) if ifaceDelta {
ncutils.Log("applying WG conf to " + file)
err = wireguard.ApplyWGQuickConf(file) err = wireguard.ApplyWGQuickConf(file)
if err != nil { if err != nil {
ncutils.Log("error restarting wg after node update " + err.Error()) ncutils.Log("error restarting wg after node update " + err.Error())
return return
} }
} else {
ncutils.Log("syncing conf to " + file)
err = wireguard.SyncWGQuickConf(cfg.Node.Interface, file)
if err != nil {
ncutils.Log("error syncing wg after peer update " + err.Error())
return
}
}
//deal with DNS //deal with DNS
if newNode.DNSOn == "yes" { if newNode.DNSOn == "yes" {
ncutils.Log("setting up DNS") ncutils.Log("setting up DNS")