From 069243e5d4369f4cb9749d19b581389428dafb6d Mon Sep 17 00:00:00 2001
From: jdl <jdl@crumpington.com>
Date: Tue, 16 Sep 2025 21:05:19 +0200
Subject: [PATCH] Cleanup / fixes

---
 peer/main.go         | 7 ++++++-
 peer/statusserver.go | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/peer/main.go b/peer/main.go
index 05a6182..fb72acb 100644
--- a/peer/main.go
+++ b/peer/main.go
@@ -113,7 +113,12 @@ func main_status() {
 		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\n\n", "Relay", report.RelayPeerIP)
+
+	if report.RelayPeerIP != 0 {
+		fmt.Printf("%-8s %d\n\n", "Relay", report.RelayPeerIP)
+	} else {
+		fmt.Printf("%-8s -\n\n", "Relay")
+	}
 
 	for _, status := range report.Remotes {
 		fmt.Printf("%3d %s\n", status.PeerIP, status.Name)
diff --git a/peer/statusserver.go b/peer/statusserver.go
index d0e6afd..12d8428 100644
--- a/peer/statusserver.go
+++ b/peer/statusserver.go
@@ -36,9 +36,11 @@ func runStatusServer(g Globals, socketPath string) {
 			Remotes: make([]RemoteStatus, 0, 255),
 		}
 
-		relayStatus, ok := g.RelayHandler.Load().Status()
-		if ok {
-			report.RelayPeerIP = relayStatus.PeerIP
+		relay := g.RelayHandler.Load()
+		if relay != nil {
+			if relayStatus, ok := relay.Status(); ok {
+				report.RelayPeerIP = relayStatus.PeerIP
+			}
 		}
 
 		for i := range g.RemotePeers {