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

fix iface issues on client and access key deletion

Browse Source
This commit is contained in:
afeiszli
2022-01-31 16:25:29 -05:00
parent 6f9f97e4b7
commit 9d2ae79fe2
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/node_grpc.go
View File

@@ -151,7 +151,7 @@ func getServerAddrs(node *models.Node) {
ID: serverNode.ID,
},
}
networkSettings, _ := logic.GetNetworkSettings(node.Network)
networkSettings, _ := logic.GetParentNetwork(node.Network)
// TODO consolidate functionality around files
networkSettings.NodesLastModified = time.Now().Unix()
networkSettings.DefaultServerAddrs = serverAddrs

11
netclient/functions/daemon.go
View File

@@ -165,9 +165,6 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
return
}
log.Println("DELETE: new node addres: " + newNode.Address)
log.Println("DELETE: current node addres: " + cfg.Node.Address)
ncutils.Log("received message to update node " + newNode.Name)
// see if cache hit, if so skip
var currentMessage = read(newNode.Network, lastNodeUpdate)
@@ -185,7 +182,6 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
//ensure that OS never changes
newNode.OS = runtime.GOOS
// check if interface needs to delta
log.Println("DELETE: running ifacedelta")
ifaceDelta := ncutils.IfaceDelta(&cfg.Node, &newNode)
cfg.Node = newNode
@@ -228,12 +224,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
ncutils.Log("error restarting wg after node update " + err.Error())
return
}
log.Println("DELETE: sleeepy time")
log.Println("DELETE: sleeepy time")
log.Println("DELETE: sleeepy time")
log.Println("DELETE: sleeepy time")
time.Sleep(time.Second * 5)
time.Sleep(time.Second >> 1)
if err = Resubscribe(client, &cfg); err != nil {
ncutils.Log("error resubscribing after interface change " + err.Error())
return

4
netclient/ncutils/iface.go
View File

@@ -1,14 +1,11 @@
package ncutils
import (
"log"
"github.com/gravitl/netmaker/models"
)
func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool {
// single comparison statements
log.Println("DELETE: checking stuff")
if newNode.Endpoint != currentNode.Endpoint ||
newNode.LocalAddress != currentNode.LocalAddress ||
newNode.PublicKey != currentNode.PublicKey ||
@@ -58,7 +55,6 @@ func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool {
return true
}
}
log.Println("DELETE: guess it's false")
return false
}