WIP

hub/handlers.go

@@ -142,22 +142,27 @@ func (a *App) _adminPeerCreate(s *api.Session, w http.ResponseWriter, r *http.Re
 }
 
 func (a *App) _adminPeerCreateSubmit(s *api.Session, w http.ResponseWriter, r *http.Request) error {
-	var ipStr string
+	var ip1Str, ip2Str string
 
 	p := &api.Peer{}
 	err := webutil.NewFormScanner(r.Form).
 		Scan("NetworkID", &p.NetworkID).
 		Scan("IP", &p.PeerIP).
 		Scan("Name", &p.Name).
-		Scan("PublicIP", &ipStr).
-		Scan("Port", &p.Port).
+		Scan("PublicIP1", &ip1Str).
+		Scan("Port1", &p.Port1).
+		Scan("PublicIP2", &ip2Str).
+		Scan("Port2", &p.Port2).
 		Scan("Relay", &p.Relay).
 		Error()
 	if err != nil {
 		return err
 	}
 
-	if p.PublicIP, err = stringToIP(ipStr); err != nil {
+	if p.PublicIP1, err = stringToIP(ip1Str); err != nil {
+		return err
+	}
+	if p.PublicIP2, err = stringToIP(ip2Str); err != nil {
 		return err
 	}
 
@@ -199,19 +204,24 @@ func (a *App) _adminPeerEditSubmit(s *api.Session, w http.ResponseWriter, r *htt
 		return err
 	}
 
-	var ipStr string
+	var ip1Str, ip2Str string
 
 	err = webutil.NewFormScanner(r.Form).
 		Scan("Name", &peer.Name).
-		Scan("PublicIP", &ipStr).
-		Scan("Port", &peer.Port).
+		Scan("PublicIP1", &ip1Str).
+		Scan("Port1", &peer.Port1).
+		Scan("PublicIP2", &ip2Str).
+		Scan("Port2", &peer.Port2).
 		Scan("Relay", &peer.Relay).
 		Error()
 	if err != nil {
 		return err
 	}
 
-	if peer.PublicIP, err = stringToIP(ipStr); err != nil {
+	if peer.PublicIP1, err = stringToIP(ip1Str); err != nil {
+		return err
+	}
+	if peer.PublicIP2, err = stringToIP(ip2Str); err != nil {
 		return err
 	}
 
@@ -295,6 +305,11 @@ func (a *App) _adminPasswordSubmit(s *api.Session, w http.ResponseWriter, r *htt
 }
 
 func (a *App) _peerInit(peer *api.Peer, w http.ResponseWriter, r *http.Request) error {
+	if len(peer.WGPubKey) != 0 {
+		http.Error(w, "Already initialized", http.StatusConflict)
+		return nil
+	}
+
 	args := m.PeerInitArgs{}
 	if err := json.NewDecoder(r.Body).Decode(&args); err != nil {
 		return err
@@ -338,16 +353,17 @@ func (a *App) peersArray(networkID int64) (peers [256]*m.Peer, err error) {
 	}
 
 	for _, p := range l {
-		if len(p.PubKey) != 0 {
+		if len(p.WGPubKey) != 0 {
 			peers[p.PeerIP] = &m.Peer{
-				PeerIP:     p.PeerIP,
-				Version:    p.Version,
-				Name:       p.Name,
-				PublicIP:   p.PublicIP,
-				Port:       p.Port,
-				Relay:      p.Relay,
-				PubKey:     p.PubKey,
-				PubSignKey: p.PubSignKey,
+				PeerIP:    p.PeerIP,
+				Version:   p.Version,
+				Name:      p.Name,
+				PublicIP1: p.PublicIP1,
+				Port1:     p.Port1,
+				PublicIP2: p.PublicIP2,
+				Port2:     p.Port2,
+				Relay:     p.Relay,
+				WGPubKey:  p.WGPubKey,
 			}
 		}
 	}