[asterisk-commits] oej: branch oej/rana-dtmf-duration-1.8 r387293 - in /team/oej/rana-dtmf-durat...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu May  2 01:25:06 2013
New Revision: 387293

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387293
Log:
Reset automerge

Modified:
    team/oej/rana-dtmf-duration-1.8/   (props changed)
    team/oej/rana-dtmf-duration-1.8/channels/chan_sip.c
    team/oej/rana-dtmf-duration-1.8/res/res_rtp_asterisk.c

Propchange: team/oej/rana-dtmf-duration-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/rana-dtmf-duration-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  2 01:25:06 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-387169
+/branches/1.8:1-387292

Modified: team/oej/rana-dtmf-duration-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-duration-1.8/channels/chan_sip.c?view=diff&rev=387293&r1=387292&r2=387293
==============================================================================
--- team/oej/rana-dtmf-duration-1.8/channels/chan_sip.c (original)
+++ team/oej/rana-dtmf-duration-1.8/channels/chan_sip.c Thu May  2 01:25:06 2013
@@ -7085,7 +7085,10 @@
 	struct sip_pvt *p = ast->tech_pvt;
 	int res = 0;
 
-	ast_log(LOG_DEBUG, " DTMF CONTINUE HERE!!! \n");
+	if (!p) {
+		ast_debug(1, "Asked to continue DTMF on channel %s with no pvt, ignoring\n", ast_channel_name(ast));
+		return res;
+	}
 
 	sip_pvt_lock(p);
 	switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {

Modified: team/oej/rana-dtmf-duration-1.8/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-duration-1.8/res/res_rtp_asterisk.c?view=diff&rev=387293&r1=387292&r2=387293
==============================================================================
--- team/oej/rana-dtmf-duration-1.8/res/res_rtp_asterisk.c (original)
+++ team/oej/rana-dtmf-duration-1.8/res/res_rtp_asterisk.c Thu May  2 01:25:06 2013
@@ -864,7 +864,7 @@
 {
 	struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
 	struct ast_sockaddr remote_address = { {0,} };
-	int hdrlen = 12, res = 0, i = 0;
+	int hdrlen = 12, res = -1, i = 0;
 	char data[256];
 	unsigned int *rtpheader = (unsigned int*)data;
 	unsigned int measured_samples;
@@ -874,7 +874,7 @@
 
 	/* Make sure we know where the remote side is so we can send them the packet we construct */
 	if (ast_sockaddr_isnull(&remote_address)) {
-		return -1;
+		goto cleanup;
 	}
 	dursamples =  duration * (8000 / 1000);     /* How do we get the sample rate for the primary media in this call? */
 
@@ -902,7 +902,7 @@
 		digit = digit - 'a' + 12;
 	} else {
 		ast_log(LOG_WARNING, "Don't know how to represent '%c'\n", digit);
-		return -1;
+		goto cleanup;
 	}
 
 	rtp->dtmfmute = ast_tvadd(ast_tvnow(), ast_tv(0, 500000));
@@ -937,13 +937,14 @@
 
 		rtp->seqno++;
 	}
+	res = 0;
 
 	/* Oh and we can't forget to turn off the stuff that says we are sending DTMF */
 	rtp->lastts += rtp->send_duration;
 	rtp->sending_dtmf = DTMF_NOT_SENDING;
 	rtp->send_digit = 0;
 
-	return 0;
+	return res;
 }
 
 static int ast_rtp_dtmf_end(struct ast_rtp_instance *instance, char digit)