Update sipgo, use ordered SIP params. (#621)

Author: dennwc

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/livekit/protocol v1.45.1-0.20260310090700-2249c636c0bf
 	github.com/livekit/psrpc v0.7.1
 	github.com/livekit/server-sdk-go/v2 v2.11.4-0.20251016050252-63f7c8381817
-	github.com/livekit/sipgo v0.13.2-0.20260119120547-800bcd1b7184
+	github.com/livekit/sipgo v0.13.2-0.20260313133657-a878476450a7
 	github.com/mjibson/go-dsp v0.0.0-20180508042940-11479a337f12
 	github.com/ory/dockertest/v3 v3.12.0
 	github.com/pion/rtp v1.8.23
@@ -71,7 +71,7 @@ require (
 	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emiago/sipgo v1.1.0 // indirect
+	github.com/emiago/sipgo v1.2.1 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gammazero/deque v1.1.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.4 // indirect

go.sum

@@ -55,8 +55,8 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/emiago/sipgo v1.1.0 h1:ryr9DhoDercbyCmCtGiZD/uB1NY745DZpsUHfSbWWaI=
-github.com/emiago/sipgo v1.1.0/go.mod h1:DuwAxBZhKMqIzQFPGZb1MVAGU6Wuxj64oTOhd5dx/FY=
+github.com/emiago/sipgo v1.2.1 h1:5JTwogbe3yQFA3sjBVueN2Q4WTU350tGeBwPYT8HMv0=
+github.com/emiago/sipgo v1.2.1/go.mod h1:DuwAxBZhKMqIzQFPGZb1MVAGU6Wuxj64oTOhd5dx/FY=
 github.com/frostbyte73/core v0.1.1 h1:ChhJOR7bAKOCPbA+lqDLE2cGKlCG5JXsDvvQr4YaJIA=
 github.com/frostbyte73/core v0.1.1/go.mod h1:mhfOtR+xWAvwXiwor7jnqPMnu4fxbv1F2MwZ0BEpzZo=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
@@ -137,8 +137,8 @@ github.com/livekit/psrpc v0.7.1 h1:ms37az0QTD3UXIWuUC5D/SkmKOlRMVRsI261eBWu/Vw=
 github.com/livekit/psrpc v0.7.1/go.mod h1:bZ4iHFQptTkbPnB0LasvRNu/OBYXEu1NA6O5BMFo9kk=
 github.com/livekit/server-sdk-go/v2 v2.11.4-0.20251016050252-63f7c8381817 h1:y5YYe37lcGMOZMw4rvreljGjLj60eDSce/N6Asp7pw8=
 github.com/livekit/server-sdk-go/v2 v2.11.4-0.20251016050252-63f7c8381817/go.mod h1:xebvU/bXHEv2fA2F8yX8PsEBWxuYWo2+cyxFJHDmJRk=
-github.com/livekit/sipgo v0.13.2-0.20260119120547-800bcd1b7184 h1:0ZyiaySHM9s4CPwn2ZCTCO3Qhq5UotqbaMoEqOGBSE0=
-github.com/livekit/sipgo v0.13.2-0.20260119120547-800bcd1b7184/go.mod h1:d3KZtpAQCRVTNFRg4x33FOcBIU9m9tin2ozJoAHy1M0=
+github.com/livekit/sipgo v0.13.2-0.20260313133657-a878476450a7 h1:RZqrHeK2p7I1A5r89/3VxorsHWcdmXgfPzKHfp/JZ7c=
+github.com/livekit/sipgo v0.13.2-0.20260313133657-a878476450a7/go.mod h1:aDa6mbFktNzA1D917RhFlIB5IOfNBTmrwt+/lX960j0=
 github.com/mackerelio/go-osstat v0.2.5 h1:+MqTbZUhoIt4m8qzkVoXUJg1EuifwlAJSk4Yl2GXh+o=
 github.com/mackerelio/go-osstat v0.2.5/go.mod h1:atxwWF+POUZcdtR1wnsUcQxTytoHG4uhl2AKKzrOajY=
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=

pkg/sip/inbound.go

@@ -1671,7 +1671,7 @@ func (c *sipInbound) sendRinging() {
 
 func (c *sipInbound) attachTag() {
 	// Set the SIP tag for following requests from us to remote (e.g. BYE).
-	c.to.Params["tag"] = string(c.id)
+	c.to.Params.Add("tag", string(c.id))
 }
 
 func (c *sipInbound) StartRinging() {

pkg/sip/inbound_process_invite_test.go

@@ -44,7 +44,7 @@ func (it *InboundTest) NewInvite(t *testing.T, callID string, cseq uint32, offer
 			Host:   it.addr.String(),
 		},
 		Params: sip.HeaderParams{
-			"tag": fromTag,
+			{"tag", fromTag},
 		},
 	})
 	inviteReq.AppendHeader(&sip.ToHeader{
@@ -163,5 +163,5 @@ func TestProcessInvite_Reinvite(t *testing.T) {
 	resp3 := it.TransactionRequest(t, req3)
 	require.Equal(t, sip.StatusCode(200), resp3.StatusCode, "200 OK")
 	require.Equal(t, answer, string(resp3.Body()), "answer should be the same")
-	require.NotEqual(t, resp2.To().Params["tag"], resp3.To().Params["tag"], "to tag should not be the same")
+	require.NotEqual(t, resp2.To().Params.GetOr("tag", ""), resp3.To().Params.GetOr("tag", ""), "to tag should not be the same")
 }

pkg/sip/outbound_test.go

@@ -20,8 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/livekit/sipgo/sip"
 	"github.com/stretchr/testify/require"
+
+	"github.com/livekit/sipgo/sip"
 )
 
 func TestOutboundRouteHeaderWithRecordRoute(t *testing.T) {
@@ -33,8 +34,8 @@ func TestOutboundRouteHeaderWithRecordRoute(t *testing.T) {
 	// 4. Make sure the ACK doesn't carry over initial Route header..
 
 	// Plumbing
-	initialRouteURI := sip.Uri{Host: "initial-header.com", UriParams: sip.HeaderParams{"lr": ""}}
-	addedRouteURI := sip.Uri{Host: "added-header.com", UriParams: sip.HeaderParams{"lr": ""}}
+	initialRouteURI := sip.Uri{Host: "initial-header.com", UriParams: sip.HeaderParams{{"lr", ""}}}
+	addedRouteURI := sip.Uri{Host: "added-header.com", UriParams: sip.HeaderParams{{"lr", ""}}}
 	initialRouteHeader := sip.RouteHeader{Address: initialRouteURI}
 	addedRouteHeader := sip.RouteHeader{Address: addedRouteURI}
 	client := NewOutboundTestClient(t, TestClientConfig{})

pkg/sip/service_test.go

@@ -11,9 +11,10 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/icholy/digest"
-	msdk "github.com/livekit/media-sdk"
 	"github.com/stretchr/testify/require"
 
+	msdk "github.com/livekit/media-sdk"
+
 	"github.com/livekit/mediatransportutil/pkg/rtcconfig"
 	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
@@ -899,7 +900,7 @@ func TestSameCallIDForAuthFlow(t *testing.T) {
 	inviteFromHeader := sip.FromHeader{
 		DisplayName: fromUser,
 		Address:     sip.Uri{User: fromUser, Host: sipServerAddress},
-		Params:      sip.NewParams().Add("tag", fromTag), // Key bit here
+		Params:      sip.HeaderParams{{"tag", fromTag}}, // Key bit here
 	}
 
 	// Create first INVITE request (without auth)

pkg/sip/types.go

@@ -166,9 +166,6 @@ func (u URI) GetURI() *sip.Uri {
 		su.Port = int(port)
 	}
 	if u.Transport != "" {
-		if su.UriParams == nil {
-			su.UriParams = make(sip.HeaderParams)
-		}
 		su.UriParams.Add("transport", string(u.Transport))
 	}
 	return su
@@ -216,7 +213,7 @@ func GetLocalTagUAS(r *sip.Request) (LocalTag, error) {
 }
 
 func getTagFrom(params sip.HeaderParams) (RemoteTag, bool) {
-	tag, ok := params["tag"]
+	tag, ok := params.Get("tag")
 	if !ok {
 		return "", false
 	}

pkg/siptest/client.go

@@ -379,7 +379,7 @@ func (c *Client) Dial(ip string, host string, number string, headers map[string]
 }
 
 func (c *Client) attemptInvite(ip, host, number string, offer []byte, authHeader string, headers map[string]string, callID string) (*sip.Request, *sip.Response, error) {
-	uri := sip.Uri{User: number, Host: host, UriParams: make(sip.HeaderParams)}
+	uri := sip.Uri{User: number, Host: host}
 	uri.UriParams.Add("transport", "tcp")
 	req := sip.NewRequest(sip.INVITE, uri)