[svn-commits] mmichelson: branch group/dns_naptr r433328 - /team/group/dns_naptr/tests/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar 24 10:55:40 2015
New Revision: 433328

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433328
Log:
Change test so that they specify lengths of strings.

This allows for me to write off-nominal tests where I can give
incorrect string lengths and see just how badly things blow
up...mwahaha.


Modified:
    team/group/dns_naptr/tests/test_dns_naptr.c

Modified: team/group/dns_naptr/tests/test_dns_naptr.c
URL: http://svnview.digium.com/svn/asterisk/team/group/dns_naptr/tests/test_dns_naptr.c?view=diff&rev=433328&r1=433327&r2=433328
==============================================================================
--- team/group/dns_naptr/tests/test_dns_naptr.c (original)
+++ team/group/dns_naptr/tests/test_dns_naptr.c Tue Mar 24 10:55:40 2015
@@ -104,12 +104,22 @@
 	return ARRAY_LEN(NAPTR_ANSWER);
 }
 
-static int write_dns_string(const char *string, char *buf)
-{
-	uint8_t len = strlen(string);
+struct dns_string {
+	uint8_t len;
+	const char *val;
+};
+
+static int write_dns_string(const struct dns_string *string, char *buf)
+{
+	uint8_t len = string->len;
 	buf[0] = len;
-	if (len) {
-		memcpy(&buf[1], string, len);
+	/*
+	 * We use the actual length of the string instead of
+	 * the stated value since sometimes we're going to lie about
+	 * the length of the string
+	 */
+	if (strlen(string->val)) {
+		memcpy(&buf[1], string->val, strlen(string->val));
 	}
 
 	return len + 1;
@@ -120,11 +130,19 @@
 	char *copy = ast_strdupa(string);
 	char *part;
 	char *ptr = buf;
+	static const struct dns_string null_label = {
+		.len = 0,
+		.val = "",
+	};
 
 	while ((part = strsep(&copy, "."))) {
-		ptr += write_dns_string(part, ptr);
-	}
-	ptr += write_dns_string("", ptr);
+		struct dns_string dns_str = {
+			.len = strlen(part),
+			.val = part,
+		};
+		ptr += write_dns_string(&dns_str, ptr);
+	}
+	ptr += write_dns_string(&null_label, ptr);
 
 	return ptr - buf;
 }
@@ -132,10 +150,10 @@
 struct naptr_record {
 	uint16_t order;
 	uint16_t preference;
-	const char *flags;
-	const char *services;
-	const char *regexp;
-	const char *replacement;
+	struct dns_string flags;
+	struct dns_string services;
+	struct dns_string regexp;
+	const char * replacement;
 };
 
 static int generate_naptr_record(struct naptr_record *record, char *buf)
@@ -150,9 +168,9 @@
 	memcpy(ptr, &net_preference, sizeof(net_preference));
 	ptr += sizeof(net_preference);
 
-	ptr += write_dns_string(record->flags, ptr);
-	ptr += write_dns_string(record->services, ptr);
-	ptr += write_dns_string(record->regexp, ptr);
+	ptr += write_dns_string(&record->flags, ptr);
+	ptr += write_dns_string(&record->services, ptr);
+	ptr += write_dns_string(&record->regexp, ptr);
 	ptr += write_dns_domain(record->replacement, ptr);
 
 	return ptr - buf;
@@ -223,10 +241,10 @@
 	RAII_VAR(struct ast_dns_result *, result, NULL, ast_dns_result_free);
 	const struct ast_dns_record *record;
 	struct naptr_record records[] = {
-		{ 100, 100, "A", "BLAH", "", "goose.down" },
-		{ 200, 200, "A", "BLAH", "", "duck.down" },
-		{ 100, 200, "A", "BLAH", "![^\\.]+\\.(.*)$!\\1!", "" },
-		{ 200, 100, "A", "BLAH", "!([^\\.]+\\.)(.*)$!\\1.happy.\\2!", "" },
+		{ 100, 100, {1, "A"}, {4, "BLAH"}, {0, ""}, "goose.down" },
+		{ 200, 200, {1, "A"}, {4, "BLAH"}, {0, ""}, "duck.down" },
+		{ 100, 200, {1, "A"}, {4, "BLAH"}, {18, "![^\\.]+\\.(.*)$!\\1!"}, "" },
+		{ 200, 100, {1, "A"}, {4, "BLAH"}, {29, "!([^\\.]+\\.)(.*)$!\\1.happy.\\2!"}, "" },
 	};
 
 	int naptr_record_order[] = { 0, 2, 3, 1 };
@@ -275,15 +293,15 @@
 			ast_test_status_update(test, "Unexpected preference in returned NAPTR record\n");
 			res = AST_TEST_FAIL;
 		}
-		if (strcmp(ast_dns_naptr_get_flags(record), records[naptr_record_order[i]].flags)) {
+		if (strcmp(ast_dns_naptr_get_flags(record), records[naptr_record_order[i]].flags.val)) {
 			ast_test_status_update(test, "Unexpected flags in returned NAPTR record\n");
 			res = AST_TEST_FAIL;
 		}
-		if (strcmp(ast_dns_naptr_get_service(record), records[naptr_record_order[i]].services)) {
+		if (strcmp(ast_dns_naptr_get_service(record), records[naptr_record_order[i]].services.val)) {
 			ast_test_status_update(test, "Unexpected services in returned NAPTR record\n");
 			res = AST_TEST_FAIL;
 		}
-		if (strcmp(ast_dns_naptr_get_regexp(record), records[naptr_record_order[i]].regexp)) {
+		if (strcmp(ast_dns_naptr_get_regexp(record), records[naptr_record_order[i]].regexp.val)) {
 			ast_test_status_update(test, "Unexpected regexp in returned NAPTR record\n");
 			res = AST_TEST_FAIL;
 		}