Merged revisions 371338 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r371338 | jrose | 2012-08-16 11:16:04 -0500 (Thu, 16 Aug 2012) | 14 lines

  chan_sip: Trigger reinvite if the SDP answer is included in the SIP ACK

  Under certain conditions, a SIP transaction involving directmedia wouldn't
  trigger a re-invite because the SDP answer was included in an ACK instead
  of in a message that we would have triggered the invite with. This patch
  just queues a source change control frame if the dialog is using
  directmedia when we find sdp for an ACK.

  (closes issue AST-913)
  Reported by: Thomas Arimont
  ........

  Merged revisions 371337 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371354 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d1e5eecc79307ce4832dff3bd120d953f8f7ea68..020833d861bdee2ed1203d684d14dfa9c47c0e17 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -26478,8 +26478,12 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
                        p->pendinginvite = 0;
                        acked = __sip_ack(p, seqno, 1 /* response */, 0);
                        if (find_sdp(req)) {
-                               if (process_sdp(p, req, SDP_T38_NONE))
+                               if (process_sdp(p, req, SDP_T38_NONE)) {
                                        return -1;
+                               }
+                               if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) {
+                                       ast_queue_control(p->owner, AST_CONTROL_SRCCHANGE);
+                               }
                        }
                        check_pendings(p);
                } else if (p->glareinvite == seqno) {