gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-07 21:54:54 +08:00
Code Issues Projects Releases Packages 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
Show stats 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!")
return err
}
ipaddr, iperr := UniqueAddress(networkName)
if iperr != nil {
fmt.Println("error in node address assignment!")
return iperr
}
if node.Network == networkName {
ipaddr, iperr := UniqueAddress(networkName)
if iperr != nil {
fmt.Println("error in node address assignment!")
return iperr
}
node.Address = ipaddr
data, err := json.Marshal(&node)
if err != nil {
return err
node.Address = ipaddr
data, err := json.Marshal(&node)
if err != nil {
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
@ -236,24 +239,28 @@ func NetworkNodesUpdateKey(networkName string) error {
collections, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil {
if database.IsEmptyRecord(err) {
return nil
}
return err
}
for _, value := range collections {
var node models.Node
err := json.Unmarshal([]byte(value), &node)
if err != nil {
fmt.Println("error in node address assignment!")
return err
}
node.Action = models.NODE_UPDATE_KEY
data, err := json.Marshal(&node)
if err != nil {
return err
if node.Network == networkName {
node.Action = models.NODE_UPDATE_KEY
data, err := json.Marshal(&node)
if err != nil {
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
@ -276,19 +283,22 @@ func UpdateNetworkLocalAddresses(networkName string) error {
fmt.Println("error in node address assignment!")
return err
}
ipaddr, iperr := UniqueAddress(networkName)
if iperr != nil {
fmt.Println("error in node address assignment!")
return iperr
}
if node.Network == networkName {
ipaddr, iperr := UniqueAddress(networkName)
if iperr != nil {
fmt.Println("error in node address assignment!")
return iperr
}
node.Address = ipaddr
newNodeData, err := json.Marshal(&node)
if err != nil {
fmt.Println("error in node address assignment!")
return err
node.Address = ipaddr
newNodeData, err := json.Marshal(&node)
if err != nil {
fmt.Println("error in node address assignment!")
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

1
netclient/wireguard/kernel.go
View file

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