Pārlūkot izejas kodu

add peer nat type

Abhishek Kondur 1 gadu atpakaļ
vecāks
revīzija
644565835c
3 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 1 1
      controllers/hosts.go
  2. 1 0
      models/host.go
  3. 1 1
      pro/controllers/relay.go

+ 1 - 1
controllers/hosts.go

@@ -493,7 +493,7 @@ func signalPeer(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	if signal.ToHostPubKey == "" || signal.TurnRelayEndpoint == "" {
+	if signal.ToHostPubKey == "" || (!servercfg.IsPro && signal.TurnRelayEndpoint == "") {
 		msg := "insufficient data to signal peer"
 		logger.Log(0, r.Header.Get("user"), msg)
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New(msg), "badrequest"))

+ 1 - 0
models/host.go

@@ -154,6 +154,7 @@ type Signal struct {
 	Reply             bool         `json:"reply"`
 	Action            SignalAction `json:"action"`
 	IsPro             bool         `json:"is_pro"`
+	PeerNATtype       string       `json:"peer_nat_type"`
 	TimeStamp         int64        `json:"timestamp"`
 }
 

+ 1 - 1
pro/controllers/relay.go

@@ -21,7 +21,7 @@ func RelayHandlers(r *mux.Router) {
 
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/createrelay", controller.Authorize(false, true, "user", http.HandlerFunc(createRelay))).Methods(http.MethodPost)
 	r.HandleFunc("/api/nodes/{network}/{nodeid}/deleterelay", controller.Authorize(false, true, "user", http.HandlerFunc(deleteRelay))).Methods(http.MethodDelete)
-	r.HandleFunc("/api/host/{hostid}/relayme", controller.Authorize(true, true, "host", http.HandlerFunc(relayme))).Methods(http.MethodPost)
+	r.HandleFunc("/api/v1/host/{hostid}/relayme", controller.Authorize(true, true, "host", http.HandlerFunc(relayme))).Methods(http.MethodPost)
 }
 
 // swagger:route POST /api/nodes/{network}/{nodeid}/createrelay nodes createRelay