|
@@ -626,6 +626,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+
|
|
if !servercfg.IsPro {
|
|
if !servercfg.IsPro {
|
|
newData.AdditionalRagIps = []string{}
|
|
newData.AdditionalRagIps = []string{}
|
|
}
|
|
}
|
|
@@ -638,6 +639,13 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
|
)
|
|
)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ if newNode.IsInternetGateway && len(newNode.InetNodeReq.InetNodeClientIDs) > 0 {
|
|
|
|
+ err = logic.ValidateInetGwReq(*newNode, newNode.InetNodeReq, newNode.IsInternetGateway && currentNode.IsInternetGateway)
|
|
|
|
+ if err != nil {
|
|
|
|
+ logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ }
|
|
relayUpdate := logic.RelayUpdates(¤tNode, newNode)
|
|
relayUpdate := logic.RelayUpdates(¤tNode, newNode)
|
|
if relayUpdate && newNode.IsRelay {
|
|
if relayUpdate && newNode.IsRelay {
|
|
err = logic.ValidateRelay(models.RelayRequest{
|
|
err = logic.ValidateRelay(models.RelayRequest{
|
|
@@ -670,19 +678,9 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
|
logic.UpdateRelayed(¤tNode, newNode)
|
|
logic.UpdateRelayed(¤tNode, newNode)
|
|
}
|
|
}
|
|
if !currentNode.IsInternetGateway && newNode.IsInternetGateway {
|
|
if !currentNode.IsInternetGateway && newNode.IsInternetGateway {
|
|
- err = logic.ValidateInetGwReq(*newNode, newNode.InetNodeReq, false)
|
|
|
|
- if err != nil {
|
|
|
|
- logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
logic.SetInternetGw(newNode, newNode.InetNodeReq)
|
|
logic.SetInternetGw(newNode, newNode.InetNodeReq)
|
|
}
|
|
}
|
|
if currentNode.IsInternetGateway && newNode.IsInternetGateway {
|
|
if currentNode.IsInternetGateway && newNode.IsInternetGateway {
|
|
- err = logic.ValidateInetGwReq(*newNode, newNode.InetNodeReq, true)
|
|
|
|
- if err != nil {
|
|
|
|
- logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
logic.UnsetInternetGw(newNode)
|
|
logic.UnsetInternetGw(newNode)
|
|
logic.SetInternetGw(newNode, newNode.InetNodeReq)
|
|
logic.SetInternetGw(newNode, newNode.InetNodeReq)
|
|
}
|
|
}
|