[asterisk-commits] oej: branch oej/grape-sip-timeout-pdd-1.8 r402920 - in /team/oej/grape-sip-ti...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Nov 21 07:22:26 2013
New Revision: 402920

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402920
Log:
Compilation happy. Now for testing.

Modified:
    team/oej/grape-sip-timeout-pdd-1.8/channels/chan_sip.c
    team/oej/grape-sip-timeout-pdd-1.8/channels/sip/include/sip.h
    team/oej/grape-sip-timeout-pdd-1.8/configs/sip.conf.sample

Modified: team/oej/grape-sip-timeout-pdd-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/grape-sip-timeout-pdd-1.8/channels/chan_sip.c?view=diff&rev=402920&r1=402919&r2=402920
==============================================================================
--- team/oej/grape-sip-timeout-pdd-1.8/channels/chan_sip.c (original)
+++ team/oej/grape-sip-timeout-pdd-1.8/channels/chan_sip.c Thu Nov 21 07:22:26 2013
@@ -20832,11 +20832,11 @@
 
 	if (resp >= 200) {
 		/* Delete timer C - we have a response */
-		AST_SCHED_DEL_UNREF(sched, dialog->timercid, dialog_unref(dialog, "when you delete the timercid sched, you should dec the refcount for the stored dialog ptr"));
+		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(dialog->timercid, sched, dialog->timer_c, dialog_proceeding_timeout, dialog, 1);
+		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);
 	}
 
@@ -28498,7 +28498,7 @@
 				timerb_set = 1;
 			} else if (!strcasecmp(v->name, "timerc")) {
 				if ((sscanf(v->value, "%30d", &peer->timer_c) != 1) || (peer->timer_c > 100)) {
-					ast_log(LOG_WARNING, "'%s' is not a valid Timer C time at line %d (above 100, default 180 s).  Using configured default %s.\n", v->value, v->lineno, global_timer_c);
+					ast_log(LOG_WARNING, "'%s' is not a valid Timer C time at line %d (above 100, default 180 s).  Using configured default %d.\n", v->value, v->lineno, global_timer_c);
 					peer->timer_c = global_timer_c;
 				}
 				timerc_set = 1;

Modified: team/oej/grape-sip-timeout-pdd-1.8/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/grape-sip-timeout-pdd-1.8/channels/sip/include/sip.h?view=diff&rev=402920&r1=402919&r2=402920
==============================================================================
--- team/oej/grape-sip-timeout-pdd-1.8/channels/sip/include/sip.h (original)
+++ team/oej/grape-sip-timeout-pdd-1.8/channels/sip/include/sip.h Thu Nov 21 07:22:26 2013
@@ -87,6 +87,7 @@
 
 #define DEFAULT_RETRANS           1000        /*!< How frequently to retransmit Default: 2 * 500 ms in RFC 3261 */
 #define DEFAULT_TIMER_T1          500         /*!< SIP timer T1 (according to RFC 3261) */
+#define DEFAULT_TIMER_C           180         /*!< SIP timer C (according to RFC 3261) */
 #define SIP_TRANS_TIMEOUT         64 * DEFAULT_TIMER_T1 /*!< SIP request timeout (rfc 3261) 64*T1
                                                          *  \todo Use known T1 for timeout (peerpoke)
                                                          */

Modified: team/oej/grape-sip-timeout-pdd-1.8/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/grape-sip-timeout-pdd-1.8/configs/sip.conf.sample?view=diff&rev=402920&r1=402919&r2=402920
==============================================================================
--- team/oej/grape-sip-timeout-pdd-1.8/configs/sip.conf.sample (original)
+++ team/oej/grape-sip-timeout-pdd-1.8/configs/sip.conf.sample Thu Nov 21 07:22:26 2013
@@ -517,7 +517,9 @@
                                 ; in this amount of time, the call will autocongest
                                 ; Defaults to 64*timert1
 ;timerc=420                     ; Call setup timer. If a provisional response is not received
-				; during this time - the call will autocongest
+				; during this time - the call will autocongest. Default 180 secs.
+				; Needs to be higher than 100. RFC says MUST be higher than 
+				; or equal to 180.
 
 ;--------------------------- RTP timers ----------------------------------------------------
 ; These timers are currently used for both audio and video streams. The RTP timeouts