Add IPv6 to Asterisk.

This adds a generic API for accommodating IPv6 and IPv4 addresses
within Asterisk. While many files have been updated to make use of the
API, chan_sip and the RTP code are the files which actually support
IPv6 addresses at the time of this commit. The way has been paved for
easier upgrading for other files in the near future, though.

Big thanks go to Simon Perrault, Marc Blanchet, and Jean-Philippe Dionne
for their hard work on this.

(closes issue #17565)
Reported by: russell
Patches: 
      asteriskv6-test-report.pdf uploaded by russell (license 2)

Review: https://reviewboard.asterisk.org/r/743



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@274783 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 107 insertions, 137 deletions

diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index bf35bc226..59cefaa46 100644
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -28,7 +28,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "include/reqresp_parser.h"
 
 /*! \brief * parses a URI in its components.*/
-int parse_uri_full(char *uri, const char *scheme, char **user, char **pass, char **host, char **port, struct uriparams *params, char **headers, char **residue)
+int parse_uri_full(char *uri, const char *scheme, char **user, char **pass,
+		   char **domain, struct uriparams *params, char **headers,
+		   char **residue)
 {
 	char *userinfo = NULL;
 	char *parameters = NULL;
@@ -58,31 +60,24 @@ int parse_uri_full(char *uri, const char *scheme, char **user, char **pass, char
 		}
 	}
 
-	if (!host) {
-		/* if we don't want to split around host, keep everything as a userinfo - cos thats how old parse_uri operated*/
+	if (!domain) {
+		/* if we don't want to split around domain, keep everything as a
+		 * userinfo - cos thats how old parse_uri operated*/
 		userinfo = uri;
 	} else {
-		char *hostport;
+		char *dom = "";
 		if ((c = strchr(uri, '@'))) {
 			*c++ = '\0';
-			hostport = c;
+			dom = c;
 			userinfo = uri;
-			uri = hostport; /* userinfo can contain ? and ; chars so step forward before looking for params and headers */
+			uri = c; /* userinfo can contain ? and ; chars so step forward before looking for params and headers */
 		} else {
 			/* domain-only URI, according to the SIP RFC. */
-			hostport = uri;
+			dom = uri;
 			userinfo = "";
 			}
 
-		if (port && (c = strchr(hostport, ':'))) {	/* Remove :port */
-			*c++ = '\0';
-			*port = c;
-			uri = c;
-		} else if (port) {
-			*port = "";
-		}
-
-		*host = hostport;
+		*domain = dom;
 	}
 
 	if (pass && (c = strchr(userinfo, ':'))) {	  /* user:password */
@@ -201,7 +196,7 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 {
 	int res = AST_TEST_PASS;
 	char uri[1024];
-	char *user, *pass, *host, *port, *headers, *residue;
+	char *user, *pass, *domain, *headers, *residue;
 	struct uriparams params;
 
 	struct testdata {
@@ -209,15 +204,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		char *uri;
 		char **userptr;
 		char **passptr;
-		char **hostptr;
-		char **portptr;
+		char **domainptr;
 		char **headersptr;
 		char **residueptr;
 		struct uriparams *paramsptr;
 		char *user;
 		char *pass;
-		char *host;
-		char *port;
+		char *domain;
 		char *headers;
 		char *residue;
 		struct uriparams params;
@@ -234,17 +227,15 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;param=discard;transport=tcp;param2=residue",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
-	    .residue = "param2=residue",
+		.residue = "param2=residue",
 		.params.transport = "tcp",
 		.params.lr = 0,
 		.params.user = ""
@@ -255,15 +246,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;param=discard;transport=tcp;param2=discard2?header=blah&header2=blah2;param3=residue",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "header=blah&header2=blah2",
 		.residue = "param3=residue",
 		.params.transport = "tcp",
@@ -276,15 +265,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:-_.!~*'()&=+$,;?/:secret@host:5060;transport=tcp",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "-_.!~*'()&=+$,;?/",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "",
 		.params.transport = "tcp",
@@ -297,15 +284,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:-_.!~*'()&=+$,@host:5060;transport=tcp",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "-_.!~*'()&=+$,",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "",
 		.params.transport = "tcp",
@@ -318,15 +303,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@1-1.a-1.:5060;transport=tcp",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "1-1.a-1.",
-		.port = "5060",
+		.domain = "1-1.a-1.:5060",
 		.headers = "",
 		.residue = "",
 		.params.transport = "tcp",
@@ -339,15 +322,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;-_.!~*'()[]/:&+$=-_.!~*'()[]/:&+$;transport=tcp",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "",
 		.params.transport = "tcp",
@@ -360,15 +341,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;-_.!~*'()[]/:&+$=-_.!~*'()[]/:&+$?header=blah&header2=blah2;-_.!~*'()[]/:&+$=residue",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "header=blah&header2=blah2",
 		.residue = "-_.!~*'()[]/:&+$=residue",
 		.params.transport = "",
@@ -381,15 +360,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;param=discard;lr?header=blah",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "header=blah",
 		.residue = "",
 		.params.transport = "",
@@ -402,15 +379,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;param=discard;lr=yes?header=blah",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "header=blah",
 		.residue = "",
 		.params.transport = "",
@@ -423,15 +398,13 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 		.uri = "sip:user:secret@host:5060;paramlr=lr;lr=no;lr=off;lr=0;lr=;=lr;lrextra;lrparam2=lr?header=blah",
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "header=blah",
 		.residue = "",
 		.params.transport = "",
@@ -466,16 +439,19 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 	}
 
 	AST_LIST_TRAVERSE(&testdatalist, testdataptr, list) {
-		user = pass = host = port = headers = residue = NULL;
+		user = pass = domain = headers = residue = NULL;
 		params.transport = params.user = params.method = params.ttl = params.maddr = NULL;
 		params.lr = 0;
 
 		ast_copy_string(uri,testdataptr->uri,sizeof(uri));
-		if (parse_uri_full(uri, "sip:,sips:", testdataptr->userptr, testdataptr->passptr, testdataptr->hostptr, testdataptr->portptr, testdataptr->paramsptr, testdataptr->headersptr, testdataptr->residueptr) ||
+		if (parse_uri_full(uri, "sip:,sips:", testdataptr->userptr,
+				   testdataptr->passptr, testdataptr->domainptr,
+				   testdataptr->paramsptr,
+				   testdataptr->headersptr,
+				   testdataptr->residueptr) ||
 			((testdataptr->userptr) && strcmp(testdataptr->user, user)) ||
 			((testdataptr->passptr) && strcmp(testdataptr->pass, pass)) ||
-			((testdataptr->hostptr) && strcmp(testdataptr->host, host)) ||
-			((testdataptr->portptr) && strcmp(testdataptr->port, port)) ||
+			((testdataptr->domainptr) && strcmp(testdataptr->domain, domain)) ||
 			((testdataptr->headersptr) && strcmp(testdataptr->headers, headers)) ||
 			((testdataptr->residueptr) && strcmp(testdataptr->residue, residue)) ||
 			((testdataptr->paramsptr) && strcmp(testdataptr->params.transport,params.transport)) ||
@@ -492,13 +468,14 @@ AST_TEST_DEFINE(sip_parse_uri_fully_test)
 }
 
 
-int parse_uri(char *uri, const char *scheme, char **user, char **pass, char **host, char **port, char **transport) {
+int parse_uri(char *uri, const char *scheme, char **user, char **pass,
+	      char **domain, char **transport) {
 	int ret;
 	char *headers;
 	struct uriparams params;
 
 	headers = NULL;
-	ret = parse_uri_full(uri, scheme, user, pass, host, port, &params, &headers, NULL);
+	ret = parse_uri_full(uri, scheme, user, pass, domain, &params, &headers, NULL);
 	if (transport) {
 		*transport=params.transport;
 	}
@@ -508,7 +485,7 @@ int parse_uri(char *uri, const char *scheme, char **user, char **pass, char **ho
 AST_TEST_DEFINE(sip_parse_uri_test)
 {
 	int res = AST_TEST_PASS;
-	char *name, *pass, *domain, *port, *transport;
+	char *name, *pass, *domain, *transport;
 	char uri1[] = "sip:name@host";
 	char uri2[] = "sip:name@host;transport=tcp";
 	char uri3[] = "sip:name:secret@host;transport=tcp";
@@ -535,70 +512,66 @@ AST_TEST_DEFINE(sip_parse_uri_test)
 	}
 
 	/* Test 1, simple URI */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri1, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri1, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			strcmp(name, "name")        ||
 			!ast_strlen_zero(pass)      ||
 			strcmp(domain, "host")      ||
-			!ast_strlen_zero(port)      ||
 			!ast_strlen_zero(transport)) {
 		ast_test_status_update(test, "Test 1: simple uri failed. \n");
 		res = AST_TEST_FAIL;
 	}
 
 	/* Test 2, add tcp transport */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri2, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri2, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			strcmp(name, "name")        ||
 			!ast_strlen_zero(pass)      ||
 			strcmp(domain, "host")    ||
-			!ast_strlen_zero(port)      ||
 			strcmp(transport, "tcp")) {
 		ast_test_status_update(test, "Test 2: uri with addtion of tcp transport failed. \n");
 		res = AST_TEST_FAIL;
 	}
 
 	/* Test 3, add secret */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri3, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri3, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			strcmp(name, "name")        ||
 			strcmp(pass, "secret")      ||
 			strcmp(domain, "host")    ||
-			!ast_strlen_zero(port)      ||
 			strcmp(transport, "tcp")) {
 		ast_test_status_update(test, "Test 3: uri with addition of secret failed.\n");
 		res = AST_TEST_FAIL;
 	}
 
 	/* Test 4, add port and unparsed header field*/
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri4, "sip:,sips:", &name, &pass, &domain, &port, &transport) ||
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri4, "sip:,sips:", &name, &pass, &domain, &transport) ||
 			strcmp(name, "name")        ||
 			strcmp(pass, "secret")      ||
-			strcmp(domain, "host")    ||
-			strcmp(port, "port")      ||
+			strcmp(domain, "host:port") ||
 			strcmp(transport, "tcp")) {
 		ast_test_status_update(test, "Test 4: add port and unparsed header field failed.\n");
 		res = AST_TEST_FAIL;
 	}
 
 	/* Test 5, verify parse_uri does not crash when given a NULL uri */
-	name = pass = domain = port = transport = NULL;
-	if (!parse_uri(NULL, "sip:,sips:", &name, &pass, &domain, &port, &transport)) {
+	name = pass = domain = transport = NULL;
+	if (!parse_uri(NULL, "sip:,sips:", &name, &pass, &domain, &transport)) {
 		ast_test_status_update(test, "Test 5: passing a NULL uri failed.\n");
 		res = AST_TEST_FAIL;
 	}
 
 	/* Test 6, verify parse_uri does not crash when given a NULL output parameters */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri6, "sip:,sips:", NULL, NULL, NULL, NULL, NULL)) {
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri6, "sip:,sips:", NULL, NULL, NULL, NULL)) {
 		ast_test_status_update(test, "Test 6: passing NULL output parameters failed.\n");
 		res = AST_TEST_FAIL;
 	}
 
-	/* Test 7, verify parse_uri returns user:secret and domain:port when no port or secret output parameters are supplied. */
-	name = pass = domain = port = transport = NULL;
-	if (parse_uri(uri7, "sip:,sips:", &name, NULL, &domain, NULL, NULL) ||
+	/* Test 7, verify parse_uri returns user:secret and domain when no port or secret output parameters are supplied. */
+	name = pass = domain = transport = NULL;
+	if (parse_uri(uri7, "sip:,sips:", &name, NULL, &domain, NULL) ||
 			strcmp(name, "name:secret")        ||
 			strcmp(domain, "host:port")) {
 
@@ -607,8 +580,8 @@ AST_TEST_DEFINE(sip_parse_uri_test)
 	}
 
 	/* 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");
@@ -616,12 +589,11 @@ AST_TEST_DEFINE(sip_parse_uri_test)
 	}
 
 	/* 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;
@@ -630,12 +602,11 @@ AST_TEST_DEFINE(sip_parse_uri_test)
 	/* 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;
@@ -644,12 +615,11 @@ AST_TEST_DEFINE(sip_parse_uri_test)
 	/* 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;
@@ -871,7 +841,7 @@ int get_name_and_number(const char *hdr, char **name, char **number)
 	tmp_number = get_in_brackets(header);
 
 	/* parse out the number here */
-	if (parse_uri(tmp_number, "sip:,sips:", &tmp_number, &dummy, &domain, &dummy, NULL) || ast_strlen_zero(tmp_number)) {
+	if (parse_uri(tmp_number, "sip:,sips:", &tmp_number, &dummy, &domain, NULL) || ast_strlen_zero(tmp_number)) {
 		ast_log(LOG_ERROR, "can not parse name and number from sip header.\n");
 		return -1;
 	}
@@ -1149,7 +1119,10 @@ AST_TEST_DEFINE(get_in_brackets_test)
 }
 
 
-int parse_name_andor_addr(char *uri, const char *scheme, char **name, char **user, char **pass, char **host, char **port, struct uriparams *params, char **headers, char **residue)
+int parse_name_andor_addr(char *uri, const char *scheme, char **name,
+			  char **user, char **pass, char **domain,
+			  struct uriparams *params, char **headers,
+			  char **residue)
 {
 	static char buf[1024];
 	char **residue2=residue;
@@ -1164,14 +1137,15 @@ int parse_name_andor_addr(char *uri, const char *scheme, char **name, char **use
 		residue2 = NULL;
 	}
 
-	return parse_uri_full(uri, scheme, user, pass, host, port, params, headers, residue2);
+	return parse_uri_full(uri, scheme, user, pass, domain, params, headers,
+			      residue2);
 }
 
 AST_TEST_DEFINE(parse_name_andor_addr_test)
 {
 	int res = AST_TEST_PASS;
 	char uri[1024];
-	char *name, *user, *pass, *host, *port, *headers, *residue;
+	char *name, *user, *pass, *domain, *headers, *residue;
 	struct uriparams params;
 
 	struct testdata {
@@ -1180,16 +1154,14 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 		char **nameptr;
 		char **userptr;
 		char **passptr;
-		char **hostptr;
-		char **portptr;
+		char **domainptr;
 		char **headersptr;
 		char **residueptr;
 		struct uriparams *paramsptr;
 		char *name;
 		char *user;
 		char *pass;
-		char *host;
-		char *port;
+		char *domain;
 		char *headers;
 		char *residue;
 		struct uriparams params;
@@ -1206,16 +1178,14 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 		.nameptr = &name,
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.name =  "name :@ ",
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "tag=tag",
 		.params.transport = "tcp",
@@ -1229,16 +1199,14 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 		.nameptr = &name,
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.name = "givenname familyname",
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "expires=3600",
 		.params.transport = "tcp",
@@ -1252,16 +1220,14 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 		.nameptr = &name,
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.name = "",
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5060",
+		.domain = "host:5060",
 		.headers = "",
 		.residue = "q=1",
 		.params.transport = "tcp",
@@ -1275,16 +1241,14 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 		.nameptr = &name,
 		.userptr = &user,
 		.passptr = &pass,
-		.hostptr = &host,
-		.portptr = &port,
+		.domainptr = &domain,
 		.headersptr = &headers,
 		.residueptr = &residue,
 		.paramsptr = &params,
 		.name = "",
 		.user = "",
 		.pass = "",
-		.host = "host",
-		.port = "",
+		.domain = "host",
 		.headers = "",
 		.residue = "",
 		.params.transport = "",
@@ -1313,16 +1277,22 @@ AST_TEST_DEFINE(parse_name_andor_addr_test)
 	}
 
 	AST_LIST_TRAVERSE(&testdatalist, testdataptr, list) {
-		name = user = pass = host = port = headers = residue = NULL;
+		name = user = pass = domain = headers = residue = NULL;
 		params.transport = params.user = params.method = params.ttl = params.maddr = NULL;
 		params.lr = 0;
 	ast_copy_string(uri,testdataptr->uri,sizeof(uri));
-		if (parse_name_andor_addr(uri, "sip:,sips:", testdataptr->nameptr, testdataptr->userptr, testdataptr->passptr, testdataptr->hostptr, testdataptr->portptr, testdataptr->paramsptr, testdataptr->headersptr, testdataptr->residueptr) ||
+		if (parse_name_andor_addr(uri, "sip:,sips:",
+					  testdataptr->nameptr,
+					  testdataptr->userptr,
+					  testdataptr->passptr,
+					  testdataptr->domainptr,
+					  testdataptr->paramsptr,
+					  testdataptr->headersptr,
+					  testdataptr->residueptr) ||
 			((testdataptr->nameptr) && strcmp(testdataptr->name, name)) ||
 			((testdataptr->userptr) && strcmp(testdataptr->user, user)) ||
 			((testdataptr->passptr) && strcmp(testdataptr->pass, pass)) ||
-			((testdataptr->hostptr) && strcmp(testdataptr->host, host)) ||
-			((testdataptr->portptr) && strcmp(testdataptr->port, port)) ||
+			((testdataptr->domainptr) && strcmp(testdataptr->domain, domain)) ||
 			((testdataptr->headersptr) && strcmp(testdataptr->headers, headers)) ||
 			((testdataptr->residueptr) && strcmp(testdataptr->residue, residue)) ||
 			((testdataptr->paramsptr) && strcmp(testdataptr->params.transport,params.transport)) ||
@@ -1391,7 +1361,11 @@ int parse_contact_header(char *contactheader, struct contactliststruct *contactl
 	AST_LIST_HEAD_SET_NOLOCK(contactlist, contact);
 	while ((last = get_comma(contactheader,&comma)) != -1) {
 
-		res = parse_name_andor_addr(contactheader,"sip:,sips:",&contact->name,&contact->user,&contact->pass,&contact->host,&contact->port,&contact->params,&contact->headers,&residue);
+		res = parse_name_andor_addr(contactheader, "sip:,sips:",
+					    &contact->name, &contact->user,
+					    &contact->pass, &contact->domain,
+					    &contact->params, &contact->headers,
+					    &residue);
 		if (res == -1) {
 			return res;
 		}
@@ -1462,8 +1436,7 @@ AST_TEST_DEFINE(parse_contact_header_test)
 		.name = "name :@;?&,",
 		.user = "user",
 		.pass = "secret",
-		.host = "host",
-		.port = "5082",
+		.domain = "host:5082",
 		.params.transport = "tcp",
 		.params.ttl = "",
 		.params.lr = 0,
@@ -1482,8 +1455,7 @@ AST_TEST_DEFINE(parse_contact_header_test)
 		.name = "",
 		.user = ",user1,",
 		.pass = ",secret1,",
-		.host = "host1",
-		.port = "",
+		.domain = "host1",
 		.params.transport = "",
 		.params.ttl = "7",
 		.params.lr = 0,
@@ -1495,8 +1467,7 @@ AST_TEST_DEFINE(parse_contact_header_test)
 		.name = "",
 		.user = "",
 		.pass = "",
-		.host = "host2",
-		.port = "",
+		.domain = "host2",
 		.params.transport = "",
 		.params.ttl = "",
 		.params.lr = 0,
@@ -1552,8 +1523,7 @@ AST_TEST_DEFINE(parse_contact_header_test)
 					strcmp(tdcontactptr->name, contactptr->name) ||
 					strcmp(tdcontactptr->user, contactptr->user) ||
 					strcmp(tdcontactptr->pass, contactptr->pass) ||
-					strcmp(tdcontactptr->host, contactptr->host) ||
-					strcmp(tdcontactptr->port, contactptr->port) ||
+					strcmp(tdcontactptr->domain, contactptr->domain) ||
 					strcmp(tdcontactptr->headers, contactptr->headers) ||
 					strcmp(tdcontactptr->expires, contactptr->expires) ||
 					strcmp(tdcontactptr->q, contactptr->q) ||