Skip to content

Commit 4198768

Browse files
committed
remove redundant code and do tweaks
1 parent cc5d493 commit 4198768

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/protocols/dns/base.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,11 @@ bool fr_dns_packet_ok(uint8_t const *packet, size_t packet_len, bool query, fr_d
404404
return false;
405405
}
406406

407+
/*
408+
* @todo - save fr_dns_marker[] data, so that it can be used by fr_dns_labels_get(). This helps
409+
* to reduce redundant work.
410+
*/
411+
407412
DECODE_FAIL(NONE);
408413
return true;
409414
}

src/protocols/dns/decode.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ static ssize_t decode_option(TALLOC_CTX *ctx, fr_pair_list_t *out,
186186
if ((da->type == FR_TYPE_STRING) && fr_dns_flag_dns_label(da)) {
187187
slen = fr_pair_dns_labels_from_network(ctx, out, da, packet_ctx->packet, data + 4, len, packet_ctx->lb, true);
188188

189-
} else if (da->flags.array) {
190-
slen = fr_pair_array_from_network(ctx, out, da, data + 4, len, decode_ctx, decode_value);
191-
192189
} else {
193190
slen = decode_value(ctx, out, da, data + 4, len, decode_ctx);
194191
}
@@ -363,7 +360,7 @@ fr_table_num_ordered_t fr_dns_reason_fail_table[] = {
363360
{ L("packet is larger than 65535"), FR_DNS_DECODE_FAIL_MAX_LENGTH_PACKET },
364361
{ L("expected query / answer, got answer / query"), FR_DNS_DECODE_FAIL_UNEXPECTED },
365362
{ L("no 'questions' in query packet"), FR_DNS_DECODE_FAIL_NO_QUESTIONS },
366-
{ L("unexprected answers in query packet"), FR_DNS_DECODE_FAIL_ANSWERS_IN_QUESTION },
363+
{ L("unexpected answers in query packet"), FR_DNS_DECODE_FAIL_ANSWERS_IN_QUESTION },
367364
{ L("unexpected NS records in query packet"), FR_DNS_DECODE_FAIL_NS_IN_QUESTION },
368365
{ L("invalid label for resource record"), FR_DNS_DECODE_FAIL_INVALID_RR_LABEL },
369366
{ L("missing resource record header"), FR_DNS_DECODE_FAIL_MISSING_RR_HEADER },

src/protocols/dns/encode.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ ssize_t fr_dns_encode(fr_dbuff_t *dbuff, fr_pair_list_t *vps, fr_dns_ctx_t *pack
454454
ssize_t slen;
455455
uint8_t *packet;
456456
fr_pair_t *vp;
457-
fr_dcursor_t cursor, child_cursor;
457+
fr_dcursor_t cursor;
458458
fr_da_stack_t da_stack;
459459

460460
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
474474
/*
475475
* Encode the header.
476476
*/
477-
fr_pair_dcursor_init(&child_cursor, &vp->vp_group);
478477
fr_proto_da_stack_build(&da_stack, attr_dns_packet);
479478

480479
slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, &cursor, packet_ctx, encode_value, NULL);

0 commit comments

Comments
 (0)