PR comments, except one

Author: alexlivekit

go.mod

@@ -142,3 +142,5 @@ require (
 	google.golang.org/grpc v1.76.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
+
+replace github.com/livekit/psrpc => ../psrpc

pkg/sip/inbound.go

@@ -28,8 +28,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
-
 	"github.com/frostbyte73/core"
 	"github.com/icholy/digest"
 	"github.com/pkg/errors"
@@ -42,6 +40,7 @@ import (
 	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/rpc"
+	"github.com/livekit/protocol/utils"
 	lksip "github.com/livekit/protocol/sip"
 	"github.com/livekit/protocol/tracer"
 	"github.com/livekit/protocol/utils/traceid"
@@ -139,7 +138,11 @@ func (s *Server) getCallInfo(id string) *inboundCallInfo {
 }
 
 func (s *Server) getInvite(sipCallID, toTag, fromTag string) *inProgressInvite {
-	key := fmt.Sprintf("%s:%s:%s", sipCallID, toTag, fromTag)
+	key := dialogKey{
+		sipCallID: sipCallID,
+		toTag:     toTag,
+		fromTag:   fromTag,
+	}
 	s.imu.Lock()
 	defer s.imu.Unlock()
 	is, ok := s.inProgressInvites[key]
@@ -338,6 +341,7 @@ func (s *Server) processInvite(req *sip.Request, tx sip.ServerTransaction) (retE
 	log = LoggerWithHeaders(log, cc)
 
 	if err := cc.ValidateInvite(); err != nil {
+		log.Errorw("invalid invite", err)
 		if s.conf.HideInboundPort {
 			cc.Drop()
 		} else {
@@ -348,13 +352,16 @@ func (s *Server) processInvite(req *sip.Request, tx sip.ServerTransaction) (retE
 
 	// Establish ID
 	fromTag, _ := req.From().Params.Get("tag") // always exists, via ValidateInvite() check
-	toTag, ok := req.To().Params.Get("tag")    // To() always exists, via ValidateInvite() check
+	toParams := req.To().Params                // To() always exists, via ValidateInvite() check
+	if toParams == nil {
+		toParams = sip.NewParams()
+		req.To().Params = toParams
+	}
+	toTag, ok := toParams.Get("tag")
 	if !ok {
 		// No to-tag on the invite means we need to generate one per RFC 3261 section 12.
 		// Generate a new to-tag early, to make sure both INVITES have the same ID.
-		uuid, _ := uuid.NewV4() // Same as NewResponseFromRequest in sipgo
-		toTag = uuid.String()
-		req.To().Params.Add("tag", toTag)
+		toParams.Add("tag", utils.NewGuid(""))
 	}
 	inviteProgress := s.getInvite(sipCallID, toTag, fromTag)
 	callID := inviteProgress.lkCallID

pkg/sip/server.go

@@ -126,6 +126,12 @@ type Handler interface {
 	OnSessionEnd(ctx context.Context, callIdentifier *CallIdentifier, callInfo *livekit.SIPCallInfo, reason string)
 }
 
+type dialogKey struct {
+	sipCallID string
+	toTag     string
+	fromTag   string
+}
+
 type Server struct {
 	log          logger.Logger
 	mon          *stats.Monitor
@@ -136,7 +142,7 @@ type Server struct {
 	sipUnhandled RequestHandler
 
 	imu               sync.Mutex
-	inProgressInvites map[string]*inProgressInvite
+	inProgressInvites map[dialogKey]*inProgressInvite
 
 	closing     core.Fuse
 	cmu         sync.RWMutex
@@ -172,7 +178,7 @@ func NewServer(region string, conf *config.Config, log logger.Logger, mon *stats
 		region:            region,
 		mon:               mon,
 		getIOClient:       getIOClient,
-		inProgressInvites: make(map[string]*inProgressInvite),
+		inProgressInvites: make(map[dialogKey]*inProgressInvite),
 		byRemoteTag: make(map[RemoteTag]*inboundCall),
 		byLocalTag:  make(map[LocalTag]*inboundCall),
 		byCallID:    make(map[string]*inboundCall),