[svn-commits] mvanbaak: branch 1.6.1 r218112 - /branches/1.6.1/main/rtp.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Sep 12 08:15:39 2009
New Revision: 218112

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218112
Log:
Use the ip for the new 'rtp set debug ip <foo>'.

Since 1.6.X still has the deprecated 'rtp debug ip <foo>'
this patch is different from the fix that went into trunk

(closes issue 0015711)
Reported by: davidw
Patches:
      2009082800-rtpdebug.diff.txt uploaded by mvanbaak (license 7)
Tested by: davidw

Modified:
    branches/1.6.1/main/rtp.c

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=218112&r1=218111&r2=218112
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Sat Sep 12 08:15:39 2009
@@ -4496,14 +4496,18 @@
 	return res;
 }
 
-static char *rtp_do_debug_ip(struct ast_cli_args *a)
+static char *rtp_do_debug_ip(struct ast_cli_args *a, int deprecated)
 {
 	struct hostent *hp;
 	struct ast_hostent ahp;
 	int port = 0;
 	char *p, *arg;
 
-	arg = a->argv[3];
+	if (deprecated == 1) {
+		arg = a->argv[3];
+	} else {
+		arg = a->argv[4];
+	}
 	p = strstr(arg, ":");
 	if (p) {
 		*p = '\0';
@@ -4585,7 +4589,7 @@
 	} else {
 		if (strncasecmp(a->argv[2], "ip", 2))
 			return CLI_SHOWUSAGE;
-		return rtp_do_debug_ip(a);
+		return rtp_do_debug_ip(a, 1);
 	}
 
 	return CLI_SUCCESS;
@@ -4618,7 +4622,7 @@
 			return CLI_SUCCESS;
 		}
 	} else if (a->argc == e->args +1) { /* ip */
-		return rtp_do_debug_ip(a);
+		return rtp_do_debug_ip(a, 0);
 	}
 
 	return CLI_SHOWUSAGE;   /* default, failure */