Fixing endpoint handling

Former-commit-id: 5220fd9f76

api/api.go

@@ -53,6 +53,7 @@ type StatusResponse struct {
 	Registered      bool                    `json:"registered"`
 	Terminated      bool                    `json:"terminated"`
 	Version         string                  `json:"version,omitempty"`
+	Agent           string                  `json:"agent,omitempty"`
 	OrgID           string                  `json:"orgId,omitempty"`
 	PeerStatuses    map[int]*PeerStatus     `json:"peers,omitempty"`
 	NetworkSettings network.NetworkSettings `json:"networkSettings,omitempty"`
@@ -75,6 +76,7 @@ type API struct {
 	isRegistered bool
 	isTerminated bool
 	version      string
+	agent        string
 	orgID        string
 }
 
@@ -229,6 +231,13 @@ func (s *API) SetVersion(version string) {
 	s.version = version
 }
 
+// SetAgent sets the olm agent
+func (s *API) SetAgent(agent string) {
+	s.statusMu.Lock()
+	defer s.statusMu.Unlock()
+	s.agent = agent
+}
+
 // SetOrgID sets the organization ID
 func (s *API) SetOrgID(orgID string) {
 	s.statusMu.Lock()
@@ -329,6 +338,7 @@ func (s *API) handleStatus(w http.ResponseWriter, r *http.Request) {
 		Registered:      s.isRegistered,
 		Terminated:      s.isTerminated,
 		Version:         s.version,
+		Agent:           s.agent,
 		OrgID:           s.orgID,
 		PeerStatuses:    s.peerStatuses,
 		NetworkSettings: network.GetSettings(),
@@ -458,6 +468,7 @@ func (s *API) GetStatus() StatusResponse {
 		Registered:      s.isRegistered,
 		Terminated:      s.isTerminated,
 		Version:         s.version,
+		Agent:           s.agent,
 		OrgID:           s.orgID,
 		PeerStatuses:    s.peerStatuses,
 		NetworkSettings: network.GetSettings(),

config.go

@@ -537,7 +537,7 @@ func SaveConfig(config *OlmConfig) error {
 func (c *OlmConfig) ShowConfig() {
 	configPath := getOlmConfigPath()
 
-	fmt.Println("\n=== Olm Configuration ===\n")
+	fmt.Print("\n=== Olm Configuration ===\n\n")
 	fmt.Printf("Config File: %s\n", configPath)
 
 	// Check if config file exists
@@ -548,7 +548,7 @@ func (c *OlmConfig) ShowConfig() {
 	}
 
 	fmt.Println("\n--- Configuration Values ---")
-	fmt.Println("(Format: Setting = Value [source])\n")
+	fmt.Print("(Format: Setting = Value [source])\n\n")
 
 	// Helper to get source or default
 	getSource := func(key string) string {

main.go

@@ -194,7 +194,7 @@ func runOlmMainWithArgs(ctx context.Context, cancel context.CancelFunc, signalCt
 		fmt.Println("Olm version " + olmVersion)
 		os.Exit(0)
 	}
-	logger.Info("Olm version " + olmVersion)
+	logger.Info("Olm version %s", olmVersion)
 
 	config.Version = olmVersion
 
@@ -215,6 +215,7 @@ func runOlmMainWithArgs(ctx context.Context, cancel context.CancelFunc, signalCt
 		HTTPAddr:   config.HTTPAddr,
 		SocketPath: config.SocketPath,
 		Version:    config.Version,
+		Agent:      "olm-cli",
 		OnExit:     cancel, // Pass cancel function directly to trigger shutdown
 	}
 

olm/olm.go

@@ -106,6 +106,7 @@ func Init(ctx context.Context, config GlobalConfig) {
 	}
 
 	apiServer.SetVersion(config.Version)
+	apiServer.SetAgent(config.Agent)
 
 	// Set up API handlers
 	apiServer.SetHandlers(
@@ -228,7 +229,6 @@ func StartTunnel(config TunnelConfig) {
 		interfaceName = config.InterfaceName
 		id            = config.ID
 		secret        = config.Secret
-		endpoint      = config.Endpoint
 		userToken     = config.UserToken
 	)
 
@@ -240,7 +240,7 @@ func StartTunnel(config TunnelConfig) {
 		secret,    // Use provided secret
 		userToken, // Use provided user token OPTIONAL
 		config.OrgID,
-		endpoint, // Use provided endpoint
+		config.Endpoint, // Use provided endpoint
 		config.PingIntervalDuration,
 		config.PingTimeoutDuration,
 	)
@@ -417,7 +417,7 @@ func StartTunnel(config TunnelConfig) {
 
 			apiServer.UpdatePeerStatus(site.SiteId, false, 0, siteEndpoint, false)
 
-			if err := peerManager.AddPeer(site, siteEndpoint); err != nil {
+			if err := peerManager.AddPeer(site); err != nil {
 				logger.Error("Failed to add peer: %v", err)
 				return
 			}
@@ -495,7 +495,7 @@ func StartTunnel(config TunnelConfig) {
 			siteConfig.RemoteSubnets = updateData.RemoteSubnets
 		}
 
-		if err := peerManager.UpdatePeer(siteConfig, endpoint); err != nil {
+		if err := peerManager.UpdatePeer(siteConfig); err != nil {
 			logger.Error("Failed to update peer: %v", err)
 			return
 		}
@@ -527,7 +527,7 @@ func StartTunnel(config TunnelConfig) {
 
 		holePunchManager.TriggerHolePunch() // Trigger immediate hole punch attempt so that if the peer decides to relay we have already punched close to when we need it
 
-		if err := peerManager.AddPeer(siteConfig, endpoint); err != nil {
+		if err := peerManager.AddPeer(siteConfig); err != nil {
 			logger.Error("Failed to add peer: %v", err)
 			return
 		}
@@ -822,6 +822,7 @@ func StartTunnel(config TunnelConfig) {
 				"publicKey":  publicKey.String(),
 				"relay":      !config.Holepunch,
 				"olmVersion": globalConfig.Version,
+				"olmAgent":   globalConfig.Agent,
 				"orgId":      config.OrgID,
 				"userToken":  userToken,
 			}, 1*time.Second)

olm/types.go

@@ -21,6 +21,7 @@ type GlobalConfig struct {
 	HTTPAddr   string
 	SocketPath string
 	Version    string
+	Agent      string
 
 	// Callbacks
 	OnRegistered func()

peers/manager.go

@@ -94,7 +94,7 @@ func (pm *PeerManager) GetAllPeers() []SiteConfig {
 	return peers
 }
 
-func (pm *PeerManager) AddPeer(siteConfig SiteConfig, endpoint string) error {
+func (pm *PeerManager) AddPeer(siteConfig SiteConfig) error {
 	pm.mu.Lock()
 	defer pm.mu.Unlock()
 
@@ -120,7 +120,7 @@ func (pm *PeerManager) AddPeer(siteConfig SiteConfig, endpoint string) error {
 	wgConfig := siteConfig
 	wgConfig.AllowedIps = ownedIPs
 
-	if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, endpoint); err != nil {
+	if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, pm.peerMonitor.IsPeerRelayed(siteConfig.SiteId)); err != nil {
 		return err
 	}
 
@@ -211,7 +211,7 @@ func (pm *PeerManager) RemovePeer(siteId int) error {
 			ownedIPs := pm.getOwnedAllowedIPs(promotedPeerId)
 			wgConfig := promotedPeer
 			wgConfig.AllowedIps = ownedIPs
-			if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, promotedPeer.Endpoint); err != nil {
+			if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, pm.peerMonitor.IsPeerRelayed(promotedPeerId)); err != nil {
 				logger.Error("Failed to update promoted peer %d: %v", promotedPeerId, err)
 			}
 		}
@@ -225,7 +225,7 @@ func (pm *PeerManager) RemovePeer(siteId int) error {
 	return nil
 }
 
-func (pm *PeerManager) UpdatePeer(siteConfig SiteConfig, endpoint string) error {
+func (pm *PeerManager) UpdatePeer(siteConfig SiteConfig) error {
 	pm.mu.Lock()
 	defer pm.mu.Unlock()
 
@@ -234,16 +234,6 @@ func (pm *PeerManager) UpdatePeer(siteConfig SiteConfig, endpoint string) error
 		return fmt.Errorf("peer with site ID %d not found", siteConfig.SiteId)
 	}
 
-	// Determine which endpoint to use based on relay state
-	// If the peer is currently relayed, use the relay endpoint; otherwise use the direct endpoint
-	actualEndpoint := endpoint
-	if pm.peerMonitor != nil && pm.peerMonitor.IsPeerRelayed(siteConfig.SiteId) {
-		if oldPeer.RelayEndpoint != "" {
-			actualEndpoint = oldPeer.RelayEndpoint
-			logger.Info("Peer %d is relayed, using relay endpoint: %s", siteConfig.SiteId, actualEndpoint)
-		}
-	}
-
 	// If public key changed, remove old peer first
 	if siteConfig.PublicKey != oldPeer.PublicKey {
 		if err := RemovePeer(pm.device, siteConfig.SiteId, oldPeer.PublicKey); err != nil {
@@ -295,7 +285,7 @@ func (pm *PeerManager) UpdatePeer(siteConfig SiteConfig, endpoint string) error
 	wgConfig := siteConfig
 	wgConfig.AllowedIps = ownedIPs
 
-	if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, actualEndpoint); err != nil {
+	if err := ConfigurePeer(pm.device, wgConfig, pm.privateKey, pm.peerMonitor.IsPeerRelayed(siteConfig.SiteId)); err != nil {
 		return err
 	}
 
@@ -305,7 +295,7 @@ func (pm *PeerManager) UpdatePeer(siteConfig SiteConfig, endpoint string) error
 			promotedOwnedIPs := pm.getOwnedAllowedIPs(promotedPeerId)
 			promotedWgConfig := promotedPeer
 			promotedWgConfig.AllowedIps = promotedOwnedIPs
-			if err := ConfigurePeer(pm.device, promotedWgConfig, pm.privateKey, promotedPeer.Endpoint); err != nil {
+			if err := ConfigurePeer(pm.device, promotedWgConfig, pm.privateKey, pm.peerMonitor.IsPeerRelayed(promotedPeerId)); err != nil {
 				logger.Error("Failed to update promoted peer %d: %v", promotedPeerId, err)
 			}
 		}
@@ -464,7 +454,7 @@ func (pm *PeerManager) addAllowedIp(siteId int, ip string) error {
 
 	// Only update WireGuard if we own this IP
 	if pm.allowedIPOwners[ip] == siteId {
-		if err := ConfigurePeer(pm.device, peer, pm.privateKey, peer.Endpoint); err != nil {
+		if err := ConfigurePeer(pm.device, peer, pm.privateKey, pm.peerMonitor.IsPeerRelayed(peer.SiteId)); err != nil {
 			return err
 		}
 	}
@@ -504,14 +494,14 @@ func (pm *PeerManager) removeAllowedIp(siteId int, cidr string) error {
 	newOwner, promoted := pm.releaseAllowedIP(siteId, cidr)
 
 	// Update WireGuard for this peer (to remove the IP from its config)
-	if err := ConfigurePeer(pm.device, peer, pm.privateKey, peer.Endpoint); err != nil {
+	if err := ConfigurePeer(pm.device, peer, pm.privateKey, pm.peerMonitor.IsPeerRelayed(peer.SiteId)); err != nil {
 		return err
 	}
 
 	// If another peer was promoted to owner, update their WireGuard config
 	if promoted && newOwner >= 0 {
 		if newOwnerPeer, exists := pm.peers[newOwner]; exists {
-			if err := ConfigurePeer(pm.device, newOwnerPeer, pm.privateKey, newOwnerPeer.Endpoint); err != nil {
+			if err := ConfigurePeer(pm.device, newOwnerPeer, pm.privateKey, pm.peerMonitor.IsPeerRelayed(peer.SiteId)); err != nil {
 				logger.Error("Failed to promote peer %d for IP %s: %v", newOwner, cidr, err)
 			} else {
 				logger.Info("Promoted peer %d to owner of IP %s", newOwner, cidr)

peers/peer.go

@@ -11,8 +11,14 @@ import (
 )
 
 // ConfigurePeer sets up or updates a peer within the WireGuard device
-func ConfigurePeer(dev *device.Device, siteConfig SiteConfig, privateKey wgtypes.Key, endpoint string) error {
-	siteHost, err := util.ResolveDomain(formatEndpoint(siteConfig.Endpoint))
+func ConfigurePeer(dev *device.Device, siteConfig SiteConfig, privateKey wgtypes.Key, relay bool) error {
+	var endpoint string
+	if relay && siteConfig.RelayEndpoint != "" {
+		endpoint = formatEndpoint(siteConfig.RelayEndpoint)
+	} else {
+		endpoint = formatEndpoint(siteConfig.Endpoint)
+	}
+	siteHost, err := util.ResolveDomain(endpoint)
 	if err != nil {
 		return fmt.Errorf("failed to resolve endpoint for site %d: %v", siteConfig.SiteId, err)
 	}

websocket/client.go

@@ -646,7 +646,9 @@ func (c *Client) readPumpWithDisconnectDetection() {
 
 			c.handlersMux.RLock()
 			if handler, ok := c.handlers[msg.Type]; ok {
+				logger.Debug("***********************************Running handler for message type: %s", msg.Type)
 				handler(msg)
+				logger.Debug("***********************************Finished handler for message type: %s", msg.Type)
 			}
 			c.handlersMux.RUnlock()
 		}