[svn-commits] pabelanger: branch 1.6.2 r273234 - in /branches/1.6.2: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Jun 30 12:32:23 2010
New Revision: 273234

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273234
Log:
Merged revisions 273233 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r273233 | pabelanger | 2010-06-30 13:28:04 -0400 (Wed, 30 Jun 2010) | 11 lines
  
  Fix rt(c)p set debug ip taking wrong argument
  
  Also clean up some coding errors.
  
  (closes issue #17469)
  Reported by: wdoekes
  Patches:
        astsvn-rtp-set-debug-ip.patch uploaded by wdoekes (license 717)
  Tested by: wdoekes, pabelanger
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/rtp.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/rtp.c?view=diff&rev=273234&r1=273233&r2=273234
==============================================================================
--- branches/1.6.2/main/rtp.c (original)
+++ branches/1.6.2/main/rtp.c Wed Jun 30 12:32:23 2010
@@ -4601,7 +4601,7 @@
 	int port = 0;
 	char *p, *arg;
 
-	arg = a->argv[3];
+	arg = a->argv[4];
 	p = strstr(arg, ":");
 	if (p) {
 		*p = '\0';
@@ -4616,10 +4616,11 @@
 	rtpdebugaddr.sin_family = AF_INET;
 	memcpy(&rtpdebugaddr.sin_addr, hp->h_addr, sizeof(rtpdebugaddr.sin_addr));
 	rtpdebugaddr.sin_port = htons(port);
-	if (port == 0)
+	if (port == 0) {
 		ast_cli(a->fd, "RTP Debugging Enabled for IP: %s\n", ast_inet_ntoa(rtpdebugaddr.sin_addr));
-	else
+	 } else {
 		ast_cli(a->fd, "RTP Debugging Enabled for IP: %s:%d\n", ast_inet_ntoa(rtpdebugaddr.sin_addr), port);
+	}
 	rtpdebug = 1;
 	return CLI_SUCCESS;
 }
@@ -4631,7 +4632,7 @@
 	int port = 0;
 	char *p, *arg;
 
-	arg = a->argv[3];
+	arg = a->argv[4];
 	p = strstr(arg, ":");
 	if (p) {
 		*p = '\0';
@@ -4646,10 +4647,11 @@
 	rtcpdebugaddr.sin_family = AF_INET;
 	memcpy(&rtcpdebugaddr.sin_addr, hp->h_addr, sizeof(rtcpdebugaddr.sin_addr));
 	rtcpdebugaddr.sin_port = htons(port);
-	if (port == 0)
+	if (port == 0) {
 		ast_cli(a->fd, "RTCP Debugging Enabled for IP: %s\n", ast_inet_ntoa(rtcpdebugaddr.sin_addr));
-	else
+	 } else {
 		ast_cli(a->fd, "RTCP Debugging Enabled for IP: %s:%d\n", ast_inet_ntoa(rtcpdebugaddr.sin_addr), port);
+	}
 	rtcpdebug = 1;
 	return CLI_SUCCESS;
 }