[svn-commits] pabelanger: trunk r273233 - /trunk/res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Jun 30 12:28:04 2010
New Revision: 273233

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273233
Log:
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:
    trunk/res/res_rtp_asterisk.c

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=273233&r1=273232&r2=273233
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Wed Jun 30 12:28:04 2010
@@ -2532,10 +2532,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;
 }
@@ -2545,7 +2546,7 @@
 	struct hostent *hp;
 	struct ast_hostent ahp;
 	int port = 0;
-	char *p, *arg = ast_strdupa(a->argv[3]);
+	char *p, *arg = ast_strdupa(a->argv[4]);
 
 	p = strstr(arg, ":");
 	if (p) {
@@ -2561,10 +2562,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;
 }