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

bug squashin

Browse Source
This commit is contained in:
worker-9
2021-08-05 15:02:18 -04:00
parent 438c01d619
commit 72db9424a5
2 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
functions/helpers.go
View File

@@ -215,18 +215,21 @@ func UpdateNetworkNodeAddresses(networkName string) error {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return err return err
} }
ipaddr, iperr := UniqueAddress(networkName) if node.Network == networkName {
if iperr != nil { ipaddr, iperr := UniqueAddress(networkName)
fmt.Println("error in node address assignment!") if iperr != nil {
return iperr fmt.Println("error in node address assignment!")
} return iperr
}
node.Address = ipaddr node.Address = ipaddr
data, err := json.Marshal(&node) data, err := json.Marshal(&node)
if err != nil { if err != nil {
return err return err
}
node.SetID()
database.Insert(node.ID, string(data), database.NODES_TABLE_NAME)
} }
database.Insert(node.MacAddress, string(data), database.NODES_TABLE_NAME)
} }
return nil return nil
@@ -236,24 +239,28 @@ func NetworkNodesUpdateKey(networkName string) error {
collections, err := database.FetchRecords(database.NODES_TABLE_NAME) collections, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil { if err != nil {
if database.IsEmptyRecord(err) {
return nil
}
return err return err
} }
for _, value := range collections { for _, value := range collections {
var node models.Node var node models.Node
err := json.Unmarshal([]byte(value), &node) err := json.Unmarshal([]byte(value), &node)
if err != nil { if err != nil {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return err return err
} }
if node.Network == networkName {
node.Action = models.NODE_UPDATE_KEY node.Action = models.NODE_UPDATE_KEY
data, err := json.Marshal(&node) data, err := json.Marshal(&node)
if err != nil { if err != nil {
return err return err
}
node.SetID()
database.Insert(node.ID, string(data), database.NODES_TABLE_NAME)
} }
database.Insert(node.MacAddress, string(data), database.NODES_TABLE_NAME)
} }
return nil return nil
@@ -276,19 +283,22 @@ func UpdateNetworkLocalAddresses(networkName string) error {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return err return err
} }
ipaddr, iperr := UniqueAddress(networkName) if node.Network == networkName {
if iperr != nil { ipaddr, iperr := UniqueAddress(networkName)
fmt.Println("error in node address assignment!") if iperr != nil {
return iperr fmt.Println("error in node address assignment!")
} return iperr
}
node.Address = ipaddr node.Address = ipaddr
newNodeData, err := json.Marshal(&node) newNodeData, err := json.Marshal(&node)
if err != nil { if err != nil {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return err return err
}
node.SetID()
database.Insert(node.ID, string(newNodeData), database.NODES_TABLE_NAME)
} }
database.Insert(node.MacAddress, string(newNodeData), database.NODES_TABLE_NAME)
} }
return nil return nil

1
netclient/wireguard/kernel.go
View File

@@ -365,7 +365,6 @@ func SetWGKeyConfig(network string, serveraddr string) error {
err = SetWGConfig(network, false) err = SetWGConfig(network, false)
if err != nil { if err != nil {
return err return err
log.Fatalf("Error: %v", err)
} }
return err return err