From 18d99de924309bf91ba5c0684fd64463d11cdeeb Mon Sep 17 00:00:00 2001 From: Owen Date: Fri, 21 Feb 2025 17:13:00 -0500 Subject: [PATCH] Handle messages correctly --- wg/wg.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wg/wg.go b/wg/wg.go index 6df69a7..da08f84 100644 --- a/wg/wg.go +++ b/wg/wg.go @@ -125,16 +125,21 @@ func (s *WireGuardService) LoadRemoteConfig() error { func (s *WireGuardService) handleConfig(msg websocket.WSMessage) { var config WgConfig + logger.Info("Received WireGuard configuration") + jsonData, err := json.Marshal(msg.Data) if err != nil { logger.Info("Error marshaling data: %v", err) + return } if err := json.Unmarshal(jsonData, &config); err != nil { logger.Info("Error unmarshaling target data: %v", err) + return } s.config = config + logger.Info("Config: %v", s.config) // Ensure the WireGuard interface and peers are configured if err := s.ensureWireguardInterface(config); err != nil { @@ -165,12 +170,12 @@ func (s *WireGuardService) ensureWireguardInterface(wgconfig WgConfig) error { return nil } + logger.Info("Assigning IP address %s to interface %s\n", wgconfig.IpAddress, s.interfaceName) // Assign IP address to the interface err = s.assignIPAddress(wgconfig.IpAddress) if err != nil { logger.Fatal("Failed to assign IP address: %v", err) } - logger.Info("Assigned IP address %s to interface %s\n", wgconfig.IpAddress, s.interfaceName) // Check if the interface already exists _, err = s.wgClient.Device(s.interfaceName)