support: Change non-address output format of support_format_dns_packet
It makes sense to include the owner name (LHS) and record type in the output, so that they can be checked for correctness. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
58fc66a91c
commit
62a321b12d
|
@ -90,6 +90,17 @@ extract_name (struct in_buffer full, struct in_buffer *in, struct dname *value)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
extract_name_data (struct in_buffer full, struct in_buffer *rdata,
|
||||||
|
const struct dname *owner, const char *typename, FILE *out)
|
||||||
|
{
|
||||||
|
struct dname name;
|
||||||
|
if (extract_name (full, rdata, &name))
|
||||||
|
fprintf (out, "data: %s %s %s\n", owner->name, typename, name.name);
|
||||||
|
else
|
||||||
|
fprintf (out, "error: malformed CNAME/PTR record\n");
|
||||||
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
support_format_dns_packet (const unsigned char *buffer, size_t length)
|
support_format_dns_packet (const unsigned char *buffer, size_t length)
|
||||||
{
|
{
|
||||||
|
@ -195,14 +206,11 @@ support_format_dns_packet (const unsigned char *buffer, size_t length)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case T_CNAME:
|
case T_CNAME:
|
||||||
|
extract_name_data (full, &rdata, &rname, "CNAME", mem.out);
|
||||||
|
break;
|
||||||
case T_PTR:
|
case T_PTR:
|
||||||
{
|
extract_name_data (full, &rdata, &rname, "PTR", mem.out);
|
||||||
struct dname name;
|
break;
|
||||||
if (extract_name (full, &rdata, &name))
|
|
||||||
fprintf (mem.out, "name: %s\n", name.name);
|
|
||||||
else
|
|
||||||
fprintf (mem.out, "error: malformed CNAME/PTR record\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,8 +85,8 @@ test_multiple_cnames (void)
|
||||||
"\xc0\x00\x02\x01";
|
"\xc0\x00\x02\x01";
|
||||||
check_packet (packet, sizeof (packet) - 1, __func__,
|
check_packet (packet, sizeof (packet) - 1, __func__,
|
||||||
"name: www.example\n"
|
"name: www.example\n"
|
||||||
"name: www1.example\n"
|
"data: www.example CNAME www1.example\n"
|
||||||
"name: www2.example\n"
|
"data: www1.example CNAME www2.example\n"
|
||||||
"address: 192.0.2.1\n");
|
"address: 192.0.2.1\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue