[svn-commits] simon.perreault: branch group/v6-new r272522 - /team/group/v6-new/channels/sip/

[SVN commits to the Digium repositories]

Author: simon.perreault
Date: Fri Jun 25 08:06:20 2010
New Revision: 272522

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272522
Log:
Made new tests automerged from trunk compile.

Modified:
    team/group/v6-new/channels/sip/reqresp_parser.c

Modified: team/group/v6-new/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/channels/sip/reqresp_parser.c?view=diff&rev=272522&r1=272521&r2=272522
==============================================================================
--- team/group/v6-new/channels/sip/reqresp_parser.c (original)
+++ team/group/v6-new/channels/sip/reqresp_parser.c Fri Jun 25 08:06:20 2010
@@ -580,8 +580,8 @@
 	}
 
 	/* Test 8, verify parse_uri can handle a domain only uri */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri8, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri8, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			strcmp(domain, "host") ||
 			!ast_strlen_zero(name)) {
 		ast_test_status_update(test, "Test 8: add port and unparsed header field failed.\n");
@@ -589,12 +589,11 @@
 	}
 
 	/* Test 9, add port and unparsed header field with domain only uri*/
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri9, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri9, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			!ast_strlen_zero(name)        ||
 			!ast_strlen_zero(pass)      ||
 			strcmp(domain, "host")    ||
-			strcmp(port, "port")      ||
 			strcmp(transport, "tcp")) {
 		ast_test_status_update(test, "Test 9: domain only uri failed \n");
 		res = AST_TEST_FAIL;
@@ -603,12 +602,11 @@
 	/* Test 10, handle invalid/missing "sip:,sips:" scheme
 	 * we expect parse_uri to return an error, but still parse
 	 * the results correctly here */
-	name = pass = domain = port = transport = NULL;
-	if (!parse_uri(uri10, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (!parse_uri(uri10, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			!ast_strlen_zero(name)        ||
 			!ast_strlen_zero(pass)      ||
 			strcmp(domain, "host")    ||
-			strcmp(port, "port")      ||
 			strcmp(transport, "tcp")) {
 		ast_test_status_update(test, "Test 10: missing \"sip:sips:\" scheme failed\n");
 		res = AST_TEST_FAIL;
@@ -617,12 +615,11 @@
 	/* Test 11, simple domain only URI with missing scheme
 	 * we expect parse_uri to return an error, but still parse
 	 * the results correctly here */
-	name = pass = domain = port = transport = NULL;
-	if (!parse_uri(uri11, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (!parse_uri(uri11, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			!ast_strlen_zero(name)      ||
 			!ast_strlen_zero(pass)      ||
 			strcmp(domain, "host")      ||
-			!ast_strlen_zero(port)      ||
 			!ast_strlen_zero(transport)) {
 		ast_test_status_update(test, "Test 11: simple uri with missing scheme failed. \n");
 		res = AST_TEST_FAIL;