[asterisk-commits] oej: branch oej/teapot-1.8 r402922 - /team/oej/teapot-1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Nov 21 07:45:02 2013
New Revision: 402922

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402922
Log:
Anyone can make mistakes... ;-)

Modified:
    team/oej/teapot-1.8/channels/chan_sip.c

Modified: team/oej/teapot-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/channels/chan_sip.c?view=diff&rev=402922&r1=402921&r2=402922
==============================================================================
--- team/oej/teapot-1.8/channels/chan_sip.c (original)
+++ team/oej/teapot-1.8/channels/chan_sip.c Thu Nov 21 07:45:02 2013
@@ -20942,14 +20942,6 @@
  	/* Any response between 100 and 199 is PROCEEDING */
  	if (resp >= 100 && resp < 200 && p->invitestate == INV_CALLING) {
  		p->invitestate = INV_PROCEEDING;
-		if (p->timercid == -1) {
-			/* Trigger timer C */
-			AST_SCHED_REPLACE_UNREF(p->timercid, sched, p->timer_c, dialog_proceeding_timeout, p,
-						dialog_unref(_data, "dialog ptr dec when SCHED_REPLACE del op succeeded"),
-						dialog_unref(p, "dialog ptr dec when SCHED_REPLACE add failed"),
-						dialog_ref(p, "dialog ptr inc when SCHED_REPLACE add succeeded") );
-			ast_debug(3, "Setting Timer C to %d \n", p->timer_c);
-		}
 	}
 
 	if (resp >= 200) {
@@ -20957,9 +20949,20 @@
 		AST_SCHED_DEL_UNREF(sched, p->timercid, dialog_unref(p, "when you delete the timercid sched, you should dec the refcount for the stored dialog ptr"));
 		ast_debug(3, "Deleting Timer C (response received)\n");
 	} else {
-		/* reset timer C */
-		AST_SCHED_REPLACE_VARIABLE(p->timercid, sched, p->timer_c, dialog_proceeding_timeout, p, 1);
-		ast_debug(3, "Resetting Timer C to %d \n", p->timer_c);
+ 		if (p->invitestate == INV_PROCEEDING) {
+			if (p->timercid == -1) {
+				/* Trigger timer C */
+				AST_SCHED_REPLACE_UNREF(p->timercid, sched, p->timer_c * 1000, dialog_proceeding_timeout, p,
+						dialog_unref(_data, "dialog ptr dec when SCHED_REPLACE del op succeeded"),
+						dialog_unref(p, "dialog ptr dec when SCHED_REPLACE add failed"),
+						dialog_ref(p, "dialog ptr inc when SCHED_REPLACE add succeeded") );
+				ast_debug(3, "Setting Timer C to %d \n", p->timer_c);
+			} else {
+				/* reset timer C */
+				AST_SCHED_REPLACE_VARIABLE(p->timercid, sched, p->timer_c * 1000, dialog_proceeding_timeout, p, 1);
+				ast_debug(3, "Resetting Timer C to %d s \n", p->timer_c);
+			}
+		}
 	}
 
  	/* Final response, not 200 ? */