[asterisk-commits] tilghman: trunk r69797 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jun 18 14:52:56 2007
New Revision: 69797

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69797
Log:
Merged revisions 69796 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69796 | tilghman | 2007-06-18 14:48:17 -0500 (Mon, 18 Jun 2007) | 2 lines

Issue 10005 - Segfault with missing arguments, plus fix a missing define for SIP INFO channels

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=69797&r1=69796&r2=69797
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jun 18 14:52:56 2007
@@ -1646,6 +1646,7 @@
 	.send_digit_end = sip_senddigit_end,
 	.bridge = ast_rtp_bridge,
 	.send_text = sip_sendtext,
+	.func_channel_read = acf_channel_read,
 };
 
 /**--- some list management macros. **/
@@ -14992,11 +14993,14 @@
 	if (ast_strlen_zero(args.param) || strcasecmp(args.param, "rtpqos"))
 		return -1;
 
+	/* Default arguments of audio,all */
+	if (ast_strlen_zero(args.type))
+		args.type = "audio";
+	if (ast_strlen_zero(args.field))
+		args.field = "all";
+
 	memset(buf, 0, buflen);
 	memset(&qos, 0, sizeof(qos));
-
-	if (ast_strlen_zero(args.type))
-		return -1;
 
 	if (strcasecmp(args.type, "AUDIO") == 0) {
 		all = ast_rtp_get_quality(p->rtp, &qos);
@@ -15005,9 +15009,6 @@
 	} else if (strcasecmp(args.type, "TEXT") == 0) {
 		all = ast_rtp_get_quality(p->trtp, &qos);
 	}
-
-	if (ast_strlen_zero(args.field))
-		return -1;
 
 	if (strcasecmp(args.field, "local_ssrc") == 0)
 		snprintf(buf, buflen, "%u", qos.local_ssrc);