app/vppn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

WIP

Browse Source
This commit is contained in:
jdl
2026-06-07 18:12:44 +02:00
parent cad200b9cc
commit b8344a20b9
37 changed files with 568 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
hub/handlers.go
View File

@@ -142,27 +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 ip1Str, ip2Str string
var addr4Str, addr6Str string
p := &api.Peer{}
err := webutil.NewFormScanner(r.Form).
Scan("NetworkID", &p.NetworkID).
Scan("IP", &p.PeerIP).
Scan("Name", &p.Name).
Scan("PublicIP1", &ip1Str).
Scan("Port1", &p.Port1).
Scan("PublicIP2", &ip2Str).
Scan("Port2", &p.Port2).
Scan("Addr4", &addr4Str).
Scan("Port4", &p.Port4).
Scan("Addr6", &addr6Str).
Scan("Port6", &p.Port6).
Scan("Relay", &p.Relay).
Error()
if err != nil {
return err
}
if p.PublicIP1, err = stringToIP(ip1Str); err != nil {
if p.Addr4, err = stringToIP(addr4Str); err != nil {
return err
}
if p.PublicIP2, err = stringToIP(ip2Str); err != nil {
if p.Addr6, err = stringToIP(addr6Str); err != nil {
return err
}
@@ -204,24 +204,24 @@ func (a *App) _adminPeerEditSubmit(s *api.Session, w http.ResponseWriter, r *htt
return err
}
var ip1Str, ip2Str string
var addr4Str, addr6Str string
err = webutil.NewFormScanner(r.Form).
Scan("Name", &peer.Name).
Scan("PublicIP1", &ip1Str).
Scan("Port1", &peer.Port1).
Scan("PublicIP2", &ip2Str).
Scan("Port2", &peer.Port2).
Scan("Addr4", &addr4Str).
Scan("Port4", &peer.Port4).
Scan("Addr6", &addr6Str).
Scan("Port6", &peer.Port6).
Scan("Relay", &peer.Relay).
Error()
if err != nil {
return err
}
if peer.PublicIP1, err = stringToIP(ip1Str); err != nil {
if peer.Addr4, err = stringToIP(addr4Str); err != nil {
return err
}
if peer.PublicIP2, err = stringToIP(ip2Str); err != nil {
if peer.Addr6, err = stringToIP(addr6Str); err != nil {
return err
}
@@ -355,15 +355,15 @@ func (a *App) peersArray(networkID int64) (peers [256]*m.Peer, err error) {
for _, p := range l {
if len(p.WGPubKey) != 0 {
peers[p.PeerIP] = &m.Peer{
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,
PeerIP: p.PeerIP,
Version: p.Version,
Name: p.Name,
Addr4: p.Addr4,
Port4: p.Port4,
Addr6: p.Addr6,
Port6: p.Port6,
Relay: p.Relay,
WGPubKey: p.WGPubKey,
}
}
}