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

Cleanup

Browse Source
This commit is contained in:
jdl 2025-09-25 09:08:10 +02:00
parent 3d93c0206c
commit 29bbb442c8
6 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,6 +2,8 @@
## TO DO ## TO DO
* peer - write status to file instead of using sockets
* peer - improve relay selection
* Double buffering in IFReader and ConnReader ? * Double buffering in IFReader and ConnReader ?
## Hub Server Configuration ## Hub Server Configuration

23
hub/handlers.go
View File

@ -5,8 +5,6 @@ import (
"errors" "errors"
"log" "log"
"net/http" "net/http"
"net/netip"
"strings"
"vppn/hub/api" "vppn/hub/api"
"vppn/m" "vppn/m"
@ -248,27 +246,6 @@ func (a *App) _adminPeerDeleteSubmit(s *api.Session, w http.ResponseWriter, r *h
return a.redirect(w, r, "/admin/network/view/?NetworkID=%d", n.NetworkID) return a.redirect(w, r, "/admin/network/view/?NetworkID=%d", n.NetworkID)
} }
func (a *App) _adminNetworkHosts(s *api.Session, w http.ResponseWriter, r *http.Request) error {
n, peers, err := a.formGetNetworkPeers(r.Form)
if err != nil {
return err
}
b := strings.Builder{}
for _, peer := range peers {
ip := n.Network
ip[3] = peer.PeerIP
b.WriteString(netip.AddrFrom4([4]byte(ip)).String())
b.WriteString(" ")
b.WriteString(peer.Name)
b.WriteString("\n")
}
w.Write([]byte(b.String()))
return nil
}
func (a *App) _adminPasswordEdit(s *api.Session, w http.ResponseWriter, r *http.Request) error { func (a *App) _adminPasswordEdit(s *api.Session, w http.ResponseWriter, r *http.Request) error {
return a.render("/admin-password-edit.html", w, struct{ Session *api.Session }{s}) return a.render("/admin-password-edit.html", w, struct{ Session *api.Session }{s})
} }

1
hub/routes.go
View File

@ -19,7 +19,6 @@ func (a *App) registerRoutes() {
a.handleSignedIn("POST /admin/network/delete/", a._adminNetworkDeleteSubmit) a.handleSignedIn("POST /admin/network/delete/", a._adminNetworkDeleteSubmit)
a.handleSignedIn("GET /admin/network/view/", a._adminNetworkView) a.handleSignedIn("GET /admin/network/view/", a._adminNetworkView)
a.handleSignedIn("GET /admin/network/hosts/", a._adminNetworkHosts)
a.handleSignedIn("GET /admin/peer/create/", a._adminPeerCreate) a.handleSignedIn("GET /admin/peer/create/", a._adminPeerCreate)
a.handleSignedIn("POST /admin/peer/create/", a._adminPeerCreateSubmit) a.handleSignedIn("POST /admin/peer/create/", a._adminPeerCreateSubmit)
a.handleSignedIn("GET /admin/peer/view/", a._adminPeerView) a.handleSignedIn("GET /admin/peer/view/", a._adminPeerView)

3
hub/templates/network/network-view.html
View File

@ -1,7 +1,6 @@
{{define "body" -}} {{define "body" -}}
<p> <p>
<a href="/admin/network/delete/?NetworkID={{.Network.NetworkID}}">Delete</a> / <a href="/admin/network/delete/?NetworkID={{.Network.NetworkID}}">Delete</a>
<a href="/admin/network/hosts/?NetworkID={{.Network.NetworkID}}">Hosts</a>
</p> </p>
<table class="def-list"> <table class="def-list">

2
peer/main.go
View File

@ -108,9 +108,11 @@ func main_status() {
fmt.Printf("\n%s Status\n\n", netName) fmt.Printf("\n%s Status\n\n", netName)
if len(report.Network) != 4 { if len(report.Network) != 4 {
fmt.Println("ERROR: Network isn't 4 bytes.")
fmt.Printf("Network: %v\n\n", report.Network) fmt.Printf("Network: %v\n\n", report.Network)
} else { } else {
nw := report.Network nw := report.Network
fmt.Printf("%-8s %d.%d.%d.%d\n", "IP", nw[0], nw[1], nw[2], report.LocalPeerIP)
fmt.Printf("%-8s %d.%d.%d.%d/24\n", "Network", nw[0], nw[1], nw[2], nw[3]) fmt.Printf("%-8s %d.%d.%d.%d/24\n", "Network", nw[0], nw[1], nw[2], nw[3])
} }

6
peer/statusserver.go
View File

@ -10,6 +10,7 @@ import (
) )
type StatusReport struct { type StatusReport struct {
LocalPeerIP byte
Network []byte Network []byte
RelayPeerIP byte RelayPeerIP byte
Remotes []RemoteStatus Remotes []RemoteStatus
@ -32,8 +33,9 @@ func runStatusServer(g Globals, socketPath string) {
handler := func(w http.ResponseWriter, r *http.Request) { handler := func(w http.ResponseWriter, r *http.Request) {
report := StatusReport{ report := StatusReport{
Network: g.Network, LocalPeerIP: g.LocalPeerIP,
Remotes: make([]RemoteStatus, 0, 255), Network: g.Network,
Remotes: make([]RemoteStatus, 0, 255),
} }
relay := g.RelayHandler.Load() relay := g.RelayHandler.Load()