feat: dialog support setting contact header based on client connection #211

Author: emiago

client.go

@@ -147,13 +147,16 @@ func (c *Client) TransactionRequest(ctx context.Context, req *sip.Request, optio
 
 	if len(options) == 0 {
 		clientRequestBuildReq(c, req)
-		return c.requestTransaction(ctx, req)
+	} else {
+		for _, o := range options {
+			if err := o(c, req); err != nil {
+				return nil, err
+			}
+		}
 	}
 
-	for _, o := range options {
-		if err := o(c, req); err != nil {
-			return nil, err
-		}
+	if c.TxRequester != nil {
+		return c.TxRequester.Request(ctx, req)
 	}
 
 	// Do some request validation, but only place as warning
@@ -164,17 +167,20 @@ func (c *Client) TransactionRequest(ctx context.Context, req *sip.Request, optio
 		c.log.Warn("Missing Content-Length for reliable transport")
 	}
 
-	return c.requestTransaction(ctx, req)
+	return c.tx.Request(ctx, req)
 }
 
-func (c *Client) requestTransaction(ctx context.Context, req *sip.Request) (sip.ClientTransaction, error) {
-	if c.TxRequester != nil {
-		return c.TxRequester.Request(ctx, req)
+func (c *Client) newTransaction(ctx context.Context, req *sip.Request, onConnection func(conn sip.Connection) error, options ...ClientRequestOption) (sip.ClientTransaction, error) {
+	if len(options) == 0 {
+		clientRequestBuildReq(c, req)
+	} else {
+		for _, o := range options {
+			if err := o(c, req); err != nil {
+				return nil, err
+			}
+		}
 	}
-	return c.tx.Request(ctx, req)
-}
 
-func (c *Client) newTransaction(ctx context.Context, req *sip.Request, onConnection func(conn sip.Connection) error) (sip.ClientTransaction, error) {
 	if c.TxRequester != nil {
 		return c.TxRequester.Request(ctx, req)
 	}

dialog_client.go

@@ -85,22 +85,12 @@ func (s *DialogClientSession) Do(ctx context.Context, req *sip.Request) (*sip.Re
 	}
 }
 
-// TransactionRequest is doing client DIALOG request based on RFC
+// TransactionRequest is doing subsequent client DIALOG request based on RFC after initial session (INVITE) setup
 // https://www.rfc-editor.org/rfc/rfc3261#section-12.2.1
 // This ensures that you have proper request done within dialog. You should avoid setting any Dialog header (cseq, from, to, callid)
 func (s *DialogClientSession) TransactionRequest(ctx context.Context, req *sip.Request) (sip.ClientTransaction, error) {
 	s.buildReq(req)
 
-	// Overrides contact header with local connection addr
-	if cont := req.Contact(); cont.Address.Host == "" {
-		tx, err := s.UA.Client.newTransaction(ctx, req, func(conn sip.Connection) error {
-			var err error
-			cont.Address.Host, cont.Address.Port, err = sip.ParseAddr(conn.LocalAddr().String())
-			return err
-		})
-		return tx, err
-	}
-
 	// Passing option to avoid CSEQ apply
 	return s.UA.Client.TransactionRequest(ctx, req, s.requestValidate)
 }

dialog_integration_test.go

@@ -125,11 +125,10 @@ func TestIntegrationDialog(t *testing.T) {
 		defer ua.Close()
 
 		srv, _ := NewServer(ua)
-		cli, _ := NewClient(ua)
+		cli, _ := NewClient(ua, WithClientConnectionAddr("127.0.0.200:0"))
 
-		contactHDR := sip.ContactHeader{
-			Address: sip.Uri{User: "test", Host: "127.0.0.200", Port: 5088},
-		}
+		// Use for now empheral contact based on client connection
+		contactHDR := sip.ContactHeader{}
 		dialogCli := NewDialogClientCache(cli, contactHDR)
 
 		// Setup server side
@@ -141,8 +140,7 @@ func TestIntegrationDialog(t *testing.T) {
 			t.Log("UAC server: ", r.StartLine())
 		})
 
-		startTestServer(ctx, srv, contactHDR.Address.HostPort())
-		t.Run("UAS hangup", func(t *testing.T) {
+		t.Run("UAShangup", func(t *testing.T) {
 			// INVITE
 			t.Log("UAC: INVITE")
 			sess, err := dialogCli.Invite(context.TODO(), uasContact.Address, nil)

dialog_ua.go

@@ -123,7 +123,30 @@ func (d *DialogClientSession) Invite(ctx context.Context, options ...ClientReque
 	inviteReq := d.InviteRequest
 
 	var err error
-	d.inviteTx, err = cli.TransactionRequest(ctx, inviteReq, options...)
+	d.inviteTx, err = func() (sip.ClientTransaction, error) {
+		// Try overriding contact header with via or local connection host port
+		if cont := inviteReq.Contact(); cont.Address.Port == 0 {
+			return cli.newTransaction(ctx, inviteReq, func(conn sip.Connection) error {
+				// Using via instead connection to avoid double parsing
+				// host, port, err = sip.ParseAddr(conn.LocalAddr().String())
+				via := inviteReq.Via()
+				if cont.Address.Host == "" {
+					cont.Address.Host = via.Host
+					cont.Address.Port = via.Port
+					return nil
+				}
+
+				// In case host is FQDN we will not override
+				if via.Host == cont.Address.Host {
+					cont.Address.Port = via.Port
+				}
+				return nil
+			}, options...)
+		}
+
+		return cli.TransactionRequest(ctx, inviteReq, options...)
+	}()
+
 	if err == nil {
 		d.lastCSeqNo.Store(inviteReq.CSeq().SeqNo)
 	}