Try to reduce cpu when idle

dns/dns_proxy.go

@@ -599,12 +599,12 @@ func (p *DNSProxy) runTunnelPacketSender() {
 	defer p.wg.Done()
 	logger.Debug("DNS tunnel packet sender goroutine started")
 
-	ticker := time.NewTicker(1 * time.Millisecond)
-	defer ticker.Stop()
-
 	for {
-		select {
+		// Use blocking ReadContext instead of polling - much more CPU efficient
-		case <-p.ctx.Done():
+		// This will block until a packet is available or context is cancelled
+		pkt := p.tunnelEp.ReadContext(p.ctx)
+		if pkt == nil {
+			// Context was cancelled or endpoint closed
 			logger.Debug("DNS tunnel packet sender exiting")
 			// Drain any remaining packets
 			for {
@@ -615,12 +615,6 @@ func (p *DNSProxy) runTunnelPacketSender() {
 				pkt.DecRef()
 			}
 			return
-		case <-ticker.C:
-			// Try to read packets
-			for i := 0; i < 10; i++ {
-				pkt := p.tunnelEp.Read()
-				if pkt == nil {
-					break
 		}
 
 		// Extract packet data
@@ -644,8 +638,6 @@ func (p *DNSProxy) runTunnelPacketSender() {
 
 		pkt.DecRef()
 	}
-		}
-	}
 }
 
 // runPacketSender sends packets from netstack back to TUN
@@ -657,18 +649,12 @@ func (p *DNSProxy) runPacketSender() {
 	const offset = 16
 
 	for {
-		select {
+		// Use blocking ReadContext instead of polling - much more CPU efficient
-		case <-p.ctx.Done():
+		// This will block until a packet is available or context is cancelled
-			return
+		pkt := p.ep.ReadContext(p.ctx)
-		default:
-		}
-
-		// Read packets from netstack endpoint
-		pkt := p.ep.Read()
 		if pkt == nil {
-			// No packet available, small sleep to avoid busy loop
+			// Context was cancelled or endpoint closed
-			time.Sleep(1 * time.Millisecond)
+			return
-			continue
 		}
 
 		// Extract packet data as slices

peers/monitor/monitor.go

@@ -42,7 +42,7 @@ type PeerMonitor struct {
 	stack       *stack.Stack
 	ep          *channel.Endpoint
 	activePorts map[uint16]bool
-	portsLock   sync.Mutex
+	portsLock   sync.RWMutex
 	nsCtx       context.Context
 	nsCancel    context.CancelFunc
 	nsWg        sync.WaitGroup
@@ -809,9 +809,9 @@ func (pm *PeerMonitor) handlePacket(packet []byte) bool {
 	}
 
 	// Check if we are listening on this port
-	pm.portsLock.Lock()
+	pm.portsLock.RLock()
 	active := pm.activePorts[uint16(port)]
-	pm.portsLock.Unlock()
+	pm.portsLock.RUnlock()
 
 	if !active {
 		return false
@@ -842,13 +842,12 @@ func (pm *PeerMonitor) runPacketSender() {
 	defer pm.nsWg.Done()
 	logger.Debug("PeerMonitor: Packet sender goroutine started")
 
-	// Use a ticker to periodically check for packets without blocking indefinitely
-	ticker := time.NewTicker(10 * time.Millisecond)
-	defer ticker.Stop()
-
 	for {
-		select {
+		// Use blocking ReadContext instead of polling - much more CPU efficient
-		case <-pm.nsCtx.Done():
+		// This will block until a packet is available or context is cancelled
+		pkt := pm.ep.ReadContext(pm.nsCtx)
+		if pkt == nil {
+			// Context was cancelled or endpoint closed
 			logger.Debug("PeerMonitor: Packet sender context cancelled, draining packets")
 			// Drain any remaining packets before exiting
 			for {
@@ -860,12 +859,6 @@ func (pm *PeerMonitor) runPacketSender() {
 			}
 			logger.Debug("PeerMonitor: Packet sender goroutine exiting")
 			return
-		case <-ticker.C:
-			// Try to read packets in batches
-			for i := 0; i < 10; i++ {
-				pkt := pm.ep.Read()
-				if pkt == nil {
-					break
 		}
 
 		// Extract packet data
@@ -889,8 +882,6 @@ func (pm *PeerMonitor) runPacketSender() {
 
 		pkt.DecRef()
 	}
-		}
-	}
 }
 
 // dial creates a UDP connection using the netstack