[asterisk-commits] rmudgett: branch group/v14_colp r157561 - in /team/group/v14_colp: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Nov 18 17:08:35 2008
New Revision: 157561

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157561
Log:
Resolve conflicts and restart automerge.

Merged revisions 157503 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r157503 | mmichelson | 2008-11-18 16:47:57 -0600 (Tue, 18 Nov 2008) | 13 lines
  
  Add some missing invite state changes necessary in the sip_write
  function. Not setting the invite state correctly on the call was
  resulting in the Record application leaving empty files. I also
  have updated the doxygen comment next to the declaration of the
  INV_EARLY_MEDIA constant to reflect that we also use this state
  when we *send* a 18X response to an INVITE.
  
  (closes issue #13878)
  Reported by: nahuelgreco
  Patches:
        sip-early-media-recording-1.4.22.patch uploaded by nahuelgreco (license 162)
  	  Tested by: putnopvut
........

Modified:
    team/group/v14_colp/   (props changed)
    team/group/v14_colp/channels/chan_sip.c

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 18 17:08:35 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-157369
+/branches/1.4:1-157534

Modified: team/group/v14_colp/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_sip.c?view=diff&rev=157561&r1=157560&r2=157561
==============================================================================
--- team/group/v14_colp/channels/chan_sip.c (original)
+++ team/group/v14_colp/channels/chan_sip.c Tue Nov 18 17:08:35 2008
@@ -256,7 +256,7 @@
 	INV_NONE = 0,	        /*!< No state at all, maybe not an INVITE dialog */
 	INV_CALLING = 1,	/*!< Invite sent, no answer */
 	INV_PROCEEDING = 2,	/*!< We got/sent 1xx message */
-	INV_EARLY_MEDIA = 3,    /*!< We got 18x message with to-tag back */
+	INV_EARLY_MEDIA = 3,    /*!< We got/sent 18x message with to-tag back */
 	INV_COMPLETED = 4,	/*!< Got final response with error. Wait for ACK, then CONFIRMED */
 	INV_CONFIRMED = 5,	/*!< Confirmed response - we've got an ack (Incoming calls only) */
 	INV_TERMINATED = 6,	/*!< Transaction done - either successful (AST_STATE_UP) or failed, but done 
@@ -3809,8 +3809,9 @@
 				    !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
 				    !ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
 					ast_rtp_new_source(p->rtp);
+					p->invitestate = INV_EARLY_MEDIA;
 					transmit_response_with_sdp(p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE, FALSE);
-					ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);	
+					ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);
 				}
 				p->lastrtptx = time(NULL);
 				res = ast_rtp_write(p->rtp, frame);
@@ -3826,6 +3827,7 @@
 				if ((ast->_state != AST_STATE_UP) &&
 				    !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
 				    !ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
+					p->invitestate = INV_EARLY_MEDIA;
 					transmit_response_with_sdp(p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE, FALSE);
 					ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);	
 				}