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

fixed constant peer update issue

Browse Source
This commit is contained in:
afeiszli
2021-04-19 10:49:52 -04:00
parent c6714bcb8e
commit 529a511a79
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/common.go
View File

@@ -204,7 +204,7 @@ func UpdateNode(nodechange models.Node, node models.Node) (models.Node, error) {
{"expdatetime", node.ExpirationDateTime}, {"expdatetime", node.ExpirationDateTime},
{"endpoint", node.Endpoint}, {"endpoint", node.Endpoint},
{"postup", node.PostUp}, {"postup", node.PostUp},
{"preup", node.PostDown}, {"postdown", node.PostDown},
{"macaddress", node.MacAddress}, {"macaddress", node.MacAddress},
{"localaddress", node.LocalAddress}, {"localaddress", node.LocalAddress},
{"persistentkeepalive", node.PersistentKeepalive}, {"persistentkeepalive", node.PersistentKeepalive},

4
controllers/networkHttpController.go
View File

@@ -225,7 +225,7 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) {
{"displayname", network.DisplayName}, {"displayname", network.DisplayName},
{"defaultlistenport", network.DefaultListenPort}, {"defaultlistenport", network.DefaultListenPort},
{"defaultpostup", network.DefaultPostUp}, {"defaultpostup", network.DefaultPostUp},
{"defaultpreup", network.DefaultPostDown}, {"defaultpostdown", network.DefaultPostDown},
{"defaultkeepalive", network.DefaultKeepalive}, {"defaultkeepalive", network.DefaultKeepalive},
{"keyupdatetimestamp", network.KeyUpdateTimeStamp}, {"keyupdatetimestamp", network.KeyUpdateTimeStamp},
{"defaultsaveconfig", network.DefaultSaveConfig}, {"defaultsaveconfig", network.DefaultSaveConfig},
@@ -395,7 +395,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
{"displayname", network.DisplayName}, {"displayname", network.DisplayName},
{"defaultlistenport", network.DefaultListenPort}, {"defaultlistenport", network.DefaultListenPort},
{"defaultpostup", network.DefaultPostUp}, {"defaultpostup", network.DefaultPostUp},
{"defaultpreup", network.DefaultPostDown}, {"defaultpostdown", network.DefaultPostDown},
{"defaultkeepalive", network.DefaultKeepalive}, {"defaultkeepalive", network.DefaultKeepalive},
{"defaultsaveconfig", network.DefaultSaveConfig}, {"defaultsaveconfig", network.DefaultSaveConfig},
{"defaultinterface", network.DefaultInterface}, {"defaultinterface", network.DefaultInterface},

4
controllers/nodeHttpController.go
View File

@@ -686,7 +686,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) {
update := bson.D{ update := bson.D{
{"$set", bson.D{ {"$set", bson.D{
{"postup", nodechange.PostUp}, {"postup", nodechange.PostUp},
{"preup", nodechange.PostDown}, {"postdown", nodechange.PostDown},
{"isgateway", nodechange.IsGateway}, {"isgateway", nodechange.IsGateway},
{"gatewayrange", nodechange.GatewayRange}, {"gatewayrange", nodechange.GatewayRange},
{"lastmodified", nodechange.LastModified}, {"lastmodified", nodechange.LastModified},
@@ -703,7 +703,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) {
return return
} }
err = SetNetworkNodesLastModified(params["networkname"]) err = SetNetworkNodesLastModified(params["network"])
if err != nil { if err != nil {
returnErrorResponse(w,r,formatError(err, "internal")) returnErrorResponse(w,r,formatError(err, "internal"))
return return

2
models/network.go
View File

@@ -18,7 +18,7 @@ type Network struct {
DefaultInterface string `json:"defaultinterface" bson:"defaultinterface"` DefaultInterface string `json:"defaultinterface" bson:"defaultinterface"`
DefaultListenPort int32 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,numeric,min=1024,max=65535"` DefaultListenPort int32 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,numeric,min=1024,max=65535"`
DefaultPostUp string `json:"defaultpostup" bson:"defaultpostup"` DefaultPostUp string `json:"defaultpostup" bson:"defaultpostup"`
DefaultPostDown string `json:"defaultpreup" bson:"defaultpreup"` DefaultPostDown string `json:"defaultpostdown" bson:"defaultpostdown"`
KeyUpdateTimeStamp int64 `json:"keyupdatetimestamp" bson:"keyupdatetimestamp"` KeyUpdateTimeStamp int64 `json:"keyupdatetimestamp" bson:"keyupdatetimestamp"`
DefaultKeepalive int32 `json:"defaultkeepalive" bson:"defaultkeepalive" validate: "omitempty,numeric,max=1000"` DefaultKeepalive int32 `json:"defaultkeepalive" bson:"defaultkeepalive" validate: "omitempty,numeric,max=1000"`
DefaultSaveConfig *bool `json:"defaultsaveconfig" bson:"defaultsaveconfig"` DefaultSaveConfig *bool `json:"defaultsaveconfig" bson:"defaultsaveconfig"`

2
models/returnNode.go
View File

@@ -12,7 +12,7 @@ type ReturnNode struct {
PublicKey string `json:"publickey" bson:"publickey" validate:"base64"` PublicKey string `json:"publickey" bson:"publickey" validate:"base64"`
Endpoint string `json:"endpoint" bson:"endpoint" validate:"required,ipv4"` Endpoint string `json:"endpoint" bson:"endpoint" validate:"required,ipv4"`
PostUp string `json:"postup" bson:"postup"` PostUp string `json:"postup" bson:"postup"`
PostDown string `json:"preup" bson:"preup"` PostDown string `json:"postdown" bson:"postdown"`
PersistentKeepalive int32 `json:"persistentkeepalive" bson:"persistentkeepalive"` PersistentKeepalive int32 `json:"persistentkeepalive" bson:"persistentkeepalive"`
SaveConfig *bool `json:"saveconfig" bson:"saveconfig"` SaveConfig *bool `json:"saveconfig" bson:"saveconfig"`
Interface string `json:"interface" bson:"interface"` Interface string `json:"interface" bson:"interface"`

5
netclient/functions/common.go
View File

@@ -1090,8 +1090,11 @@ func CheckIn(network string) error {
if err != nil { if err != nil {
fmt.Println("ERROR DELETING INTERFACE: " + currentiface) fmt.Println("ERROR DELETING INTERFACE: " + currentiface)
} }
}
err = setWGConfig(network) err = setWGConfig(network)
if err != nil {
log.Printf("Error updating interface: %v", err)
}
}
} }
if checkinres.Checkinresponse.Needconfigupdate { if checkinres.Checkinresponse.Needconfigupdate {