Addressing comment

Author: genseric-ghiro

pkg/sip/client.go

@@ -38,7 +38,6 @@ import (
 	"github.com/livekit/psrpc"
 	"github.com/livekit/sipgo"
 	"github.com/livekit/sipgo/sip"
-	"github.com/livekit/sipgo/transport"
 
 	"github.com/livekit/sip/pkg/config"
 	siperrors "github.com/livekit/sip/pkg/errors"
@@ -51,9 +50,9 @@ import (
 type SIPClient interface {
 	TransactionRequest(req *sip.Request, options ...sipgo.ClientRequestOption) (sip.ClientTransaction, error)
 	WriteRequest(req *sip.Request, options ...sipgo.ClientRequestOption) error
-	// TransportLayer exposes sipgo's resolution and connection handling. It may
-	// be nil for clients that do not own one.
-	TransportLayer() *transport.Layer
+	// ResolveTargets returns the addresses to try for a request URI, in order.
+	// port is the port from the URI, or 0 when it carries none.
+	ResolveTargets(ctx context.Context, network, host string, port int, sipScheme string) ([]netip.AddrPort, error)
 	Close() error
 }
 

pkg/sip/outbound.go

@@ -39,8 +39,8 @@ import (
 	"github.com/livekit/protocol/utils/traceid"
 	"github.com/livekit/psrpc"
 	lksdk "github.com/livekit/server-sdk-go/v2"
+	"github.com/livekit/sipgo"
 	"github.com/livekit/sipgo/sip"
-	"github.com/livekit/sipgo/transport"
 
 	"github.com/livekit/sip/pkg/config"
 	"github.com/livekit/sip/pkg/stats"
@@ -1069,11 +1069,7 @@ func (c *sipOutbound) inviteDestinations(ctx context.Context, headers map[string
 		}
 	}
 
-	tpl := c.transportLayer()
-	if tpl == nil {
-		return unresolved
-	}
-	targets, err := tpl.ResolveTargets(ctx, uriTransport(c.uri), c.uri.Host, c.uri.Port, c.uri.Scheme)
+	targets, err := c.c.sipCli.ResolveTargets(ctx, uriTransport(c.uri), c.uri.Host, c.uri.Port, c.uri.Scheme)
 	if err != nil {
 		c.log.Warnw("could not resolve destination, falling back to transport resolution", err,
 			"host", c.uri.Host, "port", c.uri.Port)
@@ -1197,15 +1193,6 @@ authLoop:
 	return req, resp, nil
 }
 
-// transportLayer returns sipgo's transport layer, or nil when the SIP client is
-// not the real one, as in tests that substitute their own.
-func (c *sipOutbound) transportLayer() *transport.Layer {
-	if c.c.sipCli == nil {
-		return nil
-	}
-	return c.c.sipCli.TransportLayer()
-}
-
 // uriTransport returns the transport a request to uri will use, matching how
 // sipgo derives it from the request.
 func uriTransport(uri *sip.Uri) string {
@@ -1317,12 +1304,16 @@ func (c *sipOutbound) attemptInvite(ctx context.Context, dest string, callID sip
 
 	// Log the actual local port used for TCP connections from the DialPort range
 	if req.Transport() == "TCP" {
-		if tpl := c.transportLayer(); tpl != nil {
-			// The connection should be available after TransactionRequest creates it
-			if dest := req.Destination(); dest != "" {
-				if conn, err := tpl.GetConnection("tcp", dest); err == nil && conn != nil {
-					if tcpAddr, ok := conn.LocalAddr().(*net.TCPAddr); ok && tcpAddr != nil {
-						c.log.Debugw("TCP connection using port on cloud-sip side", "port", tcpAddr.Port)
+		// Type-assert to *sipgo.Client to access the embedded UserAgent
+		if sipClient, ok := c.c.sipCli.(*sipgo.Client); ok {
+			if tpl := sipClient.TransportLayer(); tpl != nil {
+				// Try to get the connection using the destination address
+				// The connection should be available after TransactionRequest creates it
+				if dest := req.Destination(); dest != "" {
+					if conn, err := tpl.GetConnection("tcp", dest); err == nil && conn != nil {
+						if tcpAddr, ok := conn.LocalAddr().(*net.TCPAddr); ok && tcpAddr != nil {
+							c.log.Debugw("TCP connection using port on cloud-sip side", "port", tcpAddr.Port)
+						}
 					}
 				}
 			}

pkg/sip/outbound_test.go

@@ -17,8 +17,10 @@ package sip
 import (
 	"context"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"net"
+	"net/netip"
 	"strings"
 	"sync"
 	"testing"
@@ -32,7 +34,6 @@ import (
 	"github.com/livekit/protocol/rpc"
 	"github.com/livekit/sipgo"
 	"github.com/livekit/sipgo/sip"
-	"github.com/livekit/sipgo/transport"
 )
 
 // recordingSIPClient is a SIPClient that records the requests written to it.
@@ -49,7 +50,9 @@ func (c *recordingSIPClient) WriteRequest(req *sip.Request, _ ...sipgo.ClientReq
 	return nil
 }
 
-func (c *recordingSIPClient) TransportLayer() *transport.Layer { return nil }
+func (c *recordingSIPClient) ResolveTargets(_ context.Context, _, _ string, _ int, _ string) ([]netip.AddrPort, error) {
+	return nil, errors.New("not resolved in this test")
+}
 
 func (c *recordingSIPClient) Close() error { return nil }
 

pkg/sip/outbound_utilities_test.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"net/netip"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -32,7 +33,6 @@ import (
 	"github.com/livekit/psrpc"
 	"github.com/livekit/sipgo"
 	"github.com/livekit/sipgo/sip"
-	"github.com/livekit/sipgo/transport"
 
 	msdk "github.com/livekit/media-sdk"
 	"github.com/livekit/media-sdk/dtmf"
@@ -358,11 +358,11 @@ type testSIPClient struct {
 	sequence     uint64
 }
 
-func (w *testSIPClient) TransportLayer() *transport.Layer {
+func (w *testSIPClient) ResolveTargets(ctx context.Context, network, host string, port int, sipScheme string) ([]netip.AddrPort, error) {
 	if w.client == nil {
-		return nil
+		return nil, errors.New("no sip client")
 	}
-	return w.client.TransportLayer()
+	return w.client.ResolveTargets(ctx, network, host, port, sipScheme)
 }
 
 func (w *testSIPClient) FillRequestBlanks(req *sip.Request) {