fix: dialog server should have same to tag on responses

emiago · Apr 28, 2024 · 0e1fece · 0e1fece
1 parent 2ba54fb
commit 0e1fece
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/dialog.go b/dialog.go
@@ -32,7 +32,6 @@ type Dialog struct {
 	state   atomic.Int32
 	stateCh chan sip.DialogState
 
-	//
 	ctx    context.Context
 	cancel context.CancelFunc
 }

diff --git a/dialog_client.go b/dialog_client.go
@@ -36,7 +36,7 @@ func (s *DialogClient) loadDialog(id string) *DialogClientSession {
 	return t
 }
 
-func (s *DialogClient) MatchDialogRequest(req *sip.Request) (*DialogClientSession, error) {
+func (s *DialogClient) matchDialogRequest(req *sip.Request) (*DialogClientSession, error) {
 	id, err := sip.UACReadRequestDialogID(req)
 	if err != nil {
 		return nil, errors.Join(err, ErrDialogOutsideDialog)
@@ -113,7 +113,7 @@ func (c *DialogClient) WriteInvite(ctx context.Context, inviteRequest *sip.Reque
 }
 
 func (c *DialogClient) ReadBye(req *sip.Request, tx sip.ServerTransaction) error {
-	dt, err := c.MatchDialogRequest(req)
+	dt, err := c.matchDialogRequest(req)
 	if err != nil {
 		return err
 	}

diff --git a/dialog_integration_test.go b/dialog_integration_test.go
@@ -109,6 +109,7 @@ func TestIntegrationDialog(t *testing.T) {
 			t.Log("UAC: INVITE")
 			sess, err := dialogCli.Invite(context.TODO(), uasContact.Address, nil)
 			require.NoError(t, err)
+			defer sess.Close()
 
 			err = sess.WaitAnswer(ctx, AnswerOptions{})
 			require.NoError(t, err)
@@ -127,6 +128,7 @@ func TestIntegrationDialog(t *testing.T) {
 			t.Log("UAC: INVITE")
 			sess, err := dialogCli.Invite(context.TODO(), uasContact.Address, nil)
 			require.NoError(t, err)
+			defer sess.Close()
 
 			err = sess.WaitAnswer(ctx, AnswerOptions{})
 			require.NoError(t, err)
@@ -228,6 +230,7 @@ func TestIntegrationDialogBrokenUAC(t *testing.T) {
 			t.Log("UAC: INVITE")
 			sess, err := dialogCli.Invite(context.TODO(), uasContact.Address, nil)
 			require.NoError(t, err)
+			defer sess.Close()
 
 			err = sess.WaitAnswer(ctx, AnswerOptions{})
 			require.NoError(t, err)
@@ -249,6 +252,7 @@ func TestIntegrationDialogBrokenUAC(t *testing.T) {
 			t.Log("UAC: INVITE")
 			sess, err := dialogCli.Invite(context.TODO(), uasContact.Address, nil)
 			require.NoError(t, err)
+			defer sess.Close()
 
 			err = sess.WaitAnswer(ctx, AnswerOptions{})
 			require.NoError(t, err)
@@ -278,5 +282,5 @@ func startTestServer(ctx context.Context, srv *Server, hostPort string) {
 	)
 	// Wait server to be ready
 	<-srvReady
-	time.Sleep(200 * time.Millisecond) // just to avoid race with listeners on UDP
+	time.Sleep(500 * time.Millisecond) // just to avoid race with listeners on UDP
 }
diff --git a/dialog_server.go b/dialog_server.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/emiago/sipgo/sip"
+	uuid "github.com/satori/go.uuid"
 )
 
 type DialogServer struct {
@@ -27,7 +28,7 @@ func (s *DialogServer) loadDialog(id string) *DialogServerSession {
 	return t
 }
 
-func (s *DialogServer) MatchDialogRequest(req *sip.Request) (*DialogServerSession, error) {
+func (s *DialogServer) matchDialogRequest(req *sip.Request) (*DialogServerSession, error) {
 	id, err := sip.UASReadRequestDialogID(req)
 	if err != nil {
 		return nil, errors.Join(ErrDialogOutsideDialog, err)
@@ -62,9 +63,22 @@ func (s *DialogServer) ReadInvite(req *sip.Request, tx sip.ServerTransaction) (*
 		return nil, ErrDialogInviteNoContact
 	}
 
+	// Prebuild already to tag for response as it must be same for all responds
+	// NewResponseFromRequest will skip this for all 100
+	uuid, err := uuid.NewV4()
+	if err != nil {
+		return nil, fmt.Errorf("generating dialog to tag failed: %w", err)
+	}
+	req.To().Params["tag"] = uuid.String()
+	id, err := sip.UASReadRequestDialogID(req)
+	if err != nil {
+		return nil, err
+	}
+
 	ctx, cancel := context.WithCancel(context.Background())
 	dtx := &DialogServerSession{
 		Dialog: Dialog{
+			ID:            id, // this id has already prebuilt tag
 			InviteRequest: req,
 			lastCSeqNo:    req.CSeq().SeqNo,
 			state:         atomic.Int32{},
@@ -81,7 +95,7 @@ func (s *DialogServer) ReadInvite(req *sip.Request, tx sip.ServerTransaction) (*
 
 // ReadAck should read from your OnAck handler
 func (s *DialogServer) ReadAck(req *sip.Request, tx sip.ServerTransaction) error {
-	dt, err := s.MatchDialogRequest(req)
+	dt, err := s.matchDialogRequest(req)
 	if err != nil {
 		return err
 	}
@@ -94,7 +108,7 @@ func (s *DialogServer) ReadAck(req *sip.Request, tx sip.ServerTransaction) error
 
 // ReadBye should read from your OnBye handler
 func (s *DialogServer) ReadBye(req *sip.Request, tx sip.ServerTransaction) error {
-	dt, err := s.MatchDialogRequest(req)
+	dt, err := s.matchDialogRequest(req)
 	if err != nil {
 		// https://datatracker.ietf.org/doc/html/rfc3261#section-15.1.2
 		// If the BYE does not
@@ -267,7 +281,9 @@ func (s *DialogServerSession) WriteResponse(res *sip.Response) error {
 		return err
 	}
 
-	s.Dialog.ID = id
+	if id != s.Dialog.ID {
+		return fmt.Errorf("ID do not match. Invite request has changed headers?")
+	}
 
 	// We need to make dialog present as ACK can land immediately after
 	s.s.dialogs.Store(id, s)