Finally got around to adressing review comments

Author: alexlivekit

pkg/sip/inbound.go

@@ -148,7 +148,7 @@ func (s *Server) cleanupInvites() {
 			s.imu.Lock()
 			for it := s.inviteTimeoutQueue.IterateRemoveAfter(inviteCredentialValidity); it.Next(); {
 				key := it.Item().Value
-				delete(s.inProgressInvites, *key)
+				delete(s.inProgressInvites, key)
 			}
 			s.imu.Unlock()
 		}
@@ -161,16 +161,22 @@ func (s *Server) getInvite(sipCallID, toTag, fromTag string) *inProgressInvite {
 		toTag:     toTag,
 		fromTag:   fromTag,
 	}
+
 	s.imu.Lock()
-	defer s.imu.Unlock()
-	is, ok := s.inProgressInvites[key]
-	if ok {
-		return is
+	is, exists := s.inProgressInvites[key]
+	s.imu.Unlock()
+	if !exists {
+		s.imu.Lock()
+		is, exists = s.inProgressInvites[key]
+		if !exists {
+			is = &inProgressInvite{sipCallID: sipCallID, timeoutLink: utils.TimeoutQueueItem[dialogKey]{Value: key}}
+			s.inProgressInvites[key] = is
+		}
+		s.imu.Unlock()
 	}
-	is = &inProgressInvite{sipCallID: sipCallID}
-	s.inProgressInvites[key] = is
-	s.inviteTimeoutQueue.Reset(&utils.TimeoutQueueItem[*dialogKey]{Value: &key})
 
+	// Always reset the timeout link, whether just created or not
+	s.inviteTimeoutQueue.Reset(&is.timeoutLink)
 	return is
 }
 

pkg/sip/server.go

@@ -24,7 +24,6 @@ import (
 	"net"
 	"net/netip"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/frostbyte73/core"
@@ -135,18 +134,17 @@ type dialogKey struct {
 }
 
 type Server struct {
-	log          logger.Logger
-	mon          *stats.Monitor
-	region       string
-	sipSrv       *sipgo.Server
-	getIOClient  GetIOInfoClient
-	sipListeners []io.Closer
-	sipUnhandled RequestHandler
-
-	imu                  sync.Mutex
-	inProgressInvites    map[dialogKey]*inProgressInvite
-	inviteTimeoutQueue   utils.TimeoutQueue[*dialogKey]
-	isCleanupTaskRunning atomic.Bool
+	log                logger.Logger
+	mon                *stats.Monitor
+	region             string
+	sipSrv             *sipgo.Server
+	getIOClient        GetIOInfoClient
+	sipListeners       []io.Closer
+	sipUnhandled       RequestHandler
+	inviteTimeoutQueue utils.TimeoutQueue[dialogKey]
+
+	imu               sync.Mutex
+	inProgressInvites map[dialogKey]*inProgressInvite
 
 	closing     core.Fuse
 	cmu         sync.RWMutex
@@ -167,9 +165,10 @@ type Server struct {
 }
 
 type inProgressInvite struct {
-	sipCallID string
-	challenge digest.Challenge
-	lkCallID  string // SCL_* LiveKit call ID assigned to this dialog
+	sipCallID   string
+	challenge   digest.Challenge
+	lkCallID    string // SCL_* LiveKit call ID assigned to this dialog
+	timeoutLink utils.TimeoutQueueItem[dialogKey]
 }
 
 func NewServer(region string, conf *config.Config, log logger.Logger, mon *stats.Monitor, getIOClient GetIOInfoClient) *Server {