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

client-interface-cleanup #6

Merged
johnnylee merged 14 commits from client-interface-cleanup into main 2025-09-17 08:00:13 +00:00
Conversation 0 Commits 14 Files Changed 14 +11 -4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 069243e5d4 - Show all commits

5
peer/main.go
View File

@ -113,7 +113,12 @@ func main_status() {
nw := report.Network nw := report.Network
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])
} }
if report.RelayPeerIP != 0 {
fmt.Printf("%-8s %d\n\n", "Relay", report.RelayPeerIP) fmt.Printf("%-8s %d\n\n", "Relay", report.RelayPeerIP)
} else {
fmt.Printf("%-8s -\n\n", "Relay")
}
for _, status := range report.Remotes { for _, status := range report.Remotes {
fmt.Printf("%3d %s\n", status.PeerIP, status.Name) fmt.Printf("%3d %s\n", status.PeerIP, status.Name)

6
peer/statusserver.go
View File

@ -36,10 +36,12 @@ func runStatusServer(g Globals, socketPath string) {
Remotes: make([]RemoteStatus, 0, 255), Remotes: make([]RemoteStatus, 0, 255),
} }
relayStatus, ok := g.RelayHandler.Load().Status() relay := g.RelayHandler.Load()
if ok { if relay != nil {
if relayStatus, ok := relay.Status(); ok {
report.RelayPeerIP = relayStatus.PeerIP report.RelayPeerIP = relayStatus.PeerIP
} }
}
for i := range g.RemotePeers { for i := range g.RemotePeers {
remote := g.RemotePeers[i].Load() remote := g.RemotePeers[i].Load()