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

fix to roaming feature

Browse Source
This commit is contained in:
afeiszli
2021-03-26 11:14:19 -04:00
parent 2637e0ee79
commit ed02a499b8
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
netclient/functions/common.go
View File

@@ -558,6 +558,7 @@ func getPublicAddr() (string, error) {
endpoint := "" endpoint := ""
if resp.StatusCode == http.StatusOK { if resp.StatusCode == http.StatusOK {
bodyBytes, err := ioutil.ReadAll(resp.Body) bodyBytes, err := ioutil.ReadAll(resp.Body)
_, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -616,6 +617,7 @@ func CheckIn() error {
fmt.Println("Checking into server: " + servercfg.Address) fmt.Println("Checking into server: " + servercfg.Address)
setupcheck := true setupcheck := true
ipchange := false
if !nodecfg.RoamingOff { if !nodecfg.RoamingOff {
fmt.Println("Checking to see if addresses have changed") fmt.Println("Checking to see if addresses have changed")
@@ -631,6 +633,7 @@ func CheckIn() error {
nodecfg.PostChanges = "true" nodecfg.PostChanges = "true"
node.Endpoint = extIP node.Endpoint = extIP
node.Postchanges = "true" node.Postchanges = "true"
ipchange = true
} }
intIP, err := getPrivateAddr() intIP, err := getPrivateAddr()
if err != nil { if err != nil {
@@ -644,11 +647,27 @@ func CheckIn() error {
nodecfg.PostChanges = "true" nodecfg.PostChanges = "true"
node.Localaddress = intIP node.Localaddress = intIP
node.Postchanges = "true" node.Postchanges = "true"
ipchange = true
} }
if node.Postchanges != "true" { if node.Postchanges != "true" {
fmt.Println("Addresses have not changed.") fmt.Println("Addresses have not changed.")
} }
} }
if ipchange {
err := modConfig(&node)
if err != nil {
return err
log.Fatalf("Error: %v", err)
}
err = setWGConfig()
if err != nil {
return err
log.Fatalf("Error: %v", err)
}
node = getNode()
nodecfg = config.Config.Node
}
var wcclient nodepb.NodeServiceClient var wcclient nodepb.NodeServiceClient
var requestOpts grpc.DialOption var requestOpts grpc.DialOption
@@ -704,12 +723,12 @@ func CheckIn() error {
} else { } else {
currentiface := readres.Node.Interface currentiface := readres.Node.Interface
ifaceupdate := newinterface != currentiface ifaceupdate := newinterface != currentiface
fmt.Println("Is it time to update the interface? ")
fmt.Println(ifaceupdate)
if err != nil { if err != nil {
log.Printf("Error retrieving interface: %v", err) log.Printf("Error retrieving interface: %v", err)
} }
if ifaceupdate { if ifaceupdate {
fmt.Println("Interface update: " + currentiface +
" >>>> " + newinterface)
err := DeleteInterface(currentiface) err := DeleteInterface(currentiface)
if err != nil { if err != nil {
fmt.Println("ERROR DELETING INTERFACE: " + currentiface) fmt.Println("ERROR DELETING INTERFACE: " + currentiface)