remove redundant code and do tweaks

Author: alandekok

src/protocols/dns/base.c

@@ -404,6 +404,11 @@ bool fr_dns_packet_ok(uint8_t const *packet, size_t packet_len, bool query, fr_d
 		return false;
 	}
 
+	/*
+	 *	@todo - save fr_dns_marker[] data, so that it can be used by fr_dns_labels_get().  This helps
+	 *	to reduce redundant work.
+	 */
+
 	DECODE_FAIL(NONE);
 	return true;
 }

src/protocols/dns/decode.c

@@ -186,9 +186,6 @@ static ssize_t decode_option(TALLOC_CTX *ctx, fr_pair_list_t *out,
 	if ((da->type == FR_TYPE_STRING) && fr_dns_flag_dns_label(da)) {
 		slen = fr_pair_dns_labels_from_network(ctx, out, da, packet_ctx->packet, data + 4, len, packet_ctx->lb, true);
 
-	} else if (da->flags.array) {
-		slen = fr_pair_array_from_network(ctx, out, da, data + 4, len, decode_ctx, decode_value);
-
 	} else {
 		slen = decode_value(ctx, out, da, data + 4, len, decode_ctx);
 	}
@@ -363,7 +360,7 @@ fr_table_num_ordered_t fr_dns_reason_fail_table[] = {
 	{ L("packet is larger than 65535"),			FR_DNS_DECODE_FAIL_MAX_LENGTH_PACKET	},
 	{ L("expected query / answer, got answer / query"),	FR_DNS_DECODE_FAIL_UNEXPECTED		},
 	{ L("no 'questions' in query packet"),			FR_DNS_DECODE_FAIL_NO_QUESTIONS	},
-	{ L("unexprected answers in query packet"),		FR_DNS_DECODE_FAIL_ANSWERS_IN_QUESTION	},
+	{ L("unexpected answers in query packet"),		FR_DNS_DECODE_FAIL_ANSWERS_IN_QUESTION	},
 	{ L("unexpected NS records in query packet"),		FR_DNS_DECODE_FAIL_NS_IN_QUESTION	},
 	{ L("invalid label for resource record"),	       	FR_DNS_DECODE_FAIL_INVALID_RR_LABEL	},
 	{ L("missing resource record header"),			FR_DNS_DECODE_FAIL_MISSING_RR_HEADER	},

src/protocols/dns/encode.c

@@ -454,7 +454,7 @@ ssize_t fr_dns_encode(fr_dbuff_t *dbuff, fr_pair_list_t *vps, fr_dns_ctx_t *pack
 	ssize_t			slen;
 	uint8_t			*packet;
 	fr_pair_t		*vp;
-	fr_dcursor_t		cursor, child_cursor;
+	fr_dcursor_t		cursor;
 	fr_da_stack_t		da_stack;
 
 	packet = fr_dbuff_current(&work_dbuff);
@@ -474,7 +474,6 @@ ssize_t fr_dns_encode(fr_dbuff_t *dbuff, fr_pair_list_t *vps, fr_dns_ctx_t *pack
 	/*
 	 *	Encode the header.
 	 */
-	fr_pair_dcursor_init(&child_cursor, &vp->vp_group);
 	fr_proto_da_stack_build(&da_stack, attr_dns_packet);
 
 	slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, &cursor, packet_ctx, encode_value, NULL);

src/tests/unit/protocols/dns/error.txt

@@ -14,7 +14,7 @@ decode-proto 44 81 9a 97 00 00 00 00 00 01 00 00  01 00 00 00 2d 00 00 dc dc 23
 match DNS packet malformed - TC bit indicates truncation
 
 decode-proto 20 20 20 20 20 20 20 20 20 20 20 20 ff
-match DNS packet malformed - unexprected answers in query packet
+match DNS packet malformed - unexpected answers in query packet
 
 decode-proto 2020 2020 0000 2020 2020 2020 012d 0000 0c20 2020 2020 2000 2520 2020 2020 ff20 2020 2020 2020 ff20 2020 2020 2020 20202020 2020 2020 2020 2020 20ff 2020 c00d
 match DNS packet malformed - no 'questions' in query packet