From 0be3ee7eeedb7eca376e20df07ec6132e67420ed Mon Sep 17 00:00:00 2001 From: Owen Date: Mon, 21 Apr 2025 10:54:25 -0400 Subject: [PATCH] Fix order of when to add peer monitoring --- main.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/main.go b/main.go index ab8c861..0d0ee55 100644 --- a/main.go +++ b/main.go @@ -311,22 +311,6 @@ func main() { logger.Error("Failed to configure interface: %v", err) } - // loop over the sites and call ConfigurePeer for each one - for _, site := range wgData.Sites { - if httpServer != nil { - httpServer.UpdatePeerStatus(site.SiteId, false, 0) - } - err = ConfigurePeer(dev, site, privateKey, endpoint) - if err != nil { - logger.Error("Failed to configure peer: %v", err) - return - } - - DarwinAddRoute(site.ServerIP, "", interfaceName) - - logger.Info("Configured peer %s", site.PublicKey) - } - peerMonitor = peermonitor.NewPeerMonitor( func(siteID int, connected bool, rtt time.Duration) { if httpServer != nil { @@ -343,6 +327,22 @@ func main() { dev, ) + // loop over the sites and call ConfigurePeer for each one + for _, site := range wgData.Sites { + if httpServer != nil { + httpServer.UpdatePeerStatus(site.SiteId, false, 0) + } + err = ConfigurePeer(dev, site, privateKey, endpoint) + if err != nil { + logger.Error("Failed to configure peer: %v", err) + return + } + + DarwinAddRoute(site.ServerIP, "", interfaceName) + + logger.Info("Configured peer %s", site.PublicKey) + } + peerMonitor.Start() logger.Info("WireGuard device created.")