|
 |
ccb6e0 |
commit 62a321b12d0e397af88fa422db65079332f971dc
|
|
|
ccb6e0 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
ccb6e0 |
Date: Fri Jun 24 18:16:41 2022 +0200
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
support: Change non-address output format of support_format_dns_packet
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
It makes sense to include the owner name (LHS) and record type in the
|
|
|
ccb6e0 |
output, so that they can be checked for correctness.
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c
|
|
|
ccb6e0 |
index 1170eafb0f008fee..ef862bc4c8d14af0 100644
|
|
|
ccb6e0 |
--- a/support/support_format_dns_packet.c
|
|
|
ccb6e0 |
+++ b/support/support_format_dns_packet.c
|
|
|
ccb6e0 |
@@ -101,6 +101,17 @@ extract_name (struct in_buffer full, struct in_buffer *in, struct dname *value)
|
|
|
ccb6e0 |
return true;
|
|
|
ccb6e0 |
}
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
+static void
|
|
|
ccb6e0 |
+extract_name_data (struct in_buffer full, struct in_buffer *rdata,
|
|
|
ccb6e0 |
+ const struct dname *owner, const char *typename, FILE *out)
|
|
|
ccb6e0 |
+{
|
|
|
ccb6e0 |
+ struct dname name;
|
|
|
ccb6e0 |
+ if (extract_name (full, rdata, &name))
|
|
|
ccb6e0 |
+ fprintf (out, "data: %s %s %s\n", owner->name, typename, name.name);
|
|
|
ccb6e0 |
+ else
|
|
|
ccb6e0 |
+ fprintf (out, "error: malformed CNAME/PTR record\n");
|
|
|
ccb6e0 |
+}
|
|
|
ccb6e0 |
+
|
|
|
ccb6e0 |
char *
|
|
|
ccb6e0 |
support_format_dns_packet (const unsigned char *buffer, size_t length)
|
|
|
ccb6e0 |
{
|
|
|
ccb6e0 |
@@ -206,14 +217,11 @@ support_format_dns_packet (const unsigned char *buffer, size_t length)
|
|
|
ccb6e0 |
}
|
|
|
ccb6e0 |
break;
|
|
|
ccb6e0 |
case T_CNAME:
|
|
|
ccb6e0 |
+ extract_name_data (full, &rdata, &rname, "CNAME", mem.out);
|
|
|
ccb6e0 |
+ break;
|
|
|
ccb6e0 |
case T_PTR:
|
|
|
ccb6e0 |
- {
|
|
|
ccb6e0 |
- struct dname name;
|
|
|
ccb6e0 |
- if (extract_name (full, &rdata, &name))
|
|
|
ccb6e0 |
- fprintf (mem.out, "name: %s\n", name.name);
|
|
|
ccb6e0 |
- else
|
|
|
ccb6e0 |
- fprintf (mem.out, "error: malformed CNAME/PTR record\n");
|
|
|
ccb6e0 |
- }
|
|
|
ccb6e0 |
+ extract_name_data (full, &rdata, &rname, "PTR", mem.out);
|
|
|
ccb6e0 |
+ break;
|
|
|
ccb6e0 |
}
|
|
|
ccb6e0 |
}
|
|
|
ccb6e0 |
|
|
|
ccb6e0 |
diff --git a/support/tst-support_format_dns_packet.c b/support/tst-support_format_dns_packet.c
|
|
|
ccb6e0 |
index b1135eebc6c02d55..35f475fe86177772 100644
|
|
|
ccb6e0 |
--- a/support/tst-support_format_dns_packet.c
|
|
|
ccb6e0 |
+++ b/support/tst-support_format_dns_packet.c
|
|
|
ccb6e0 |
@@ -85,8 +85,8 @@ test_multiple_cnames (void)
|
|
|
ccb6e0 |
"\xc0\x00\x02\x01";
|
|
|
ccb6e0 |
check_packet (packet, sizeof (packet) - 1, __func__,
|
|
|
ccb6e0 |
"name: www.example\n"
|
|
|
ccb6e0 |
- "name: www1.example\n"
|
|
|
ccb6e0 |
- "name: www2.example\n"
|
|
|
ccb6e0 |
+ "data: www.example CNAME www1.example\n"
|
|
|
ccb6e0 |
+ "data: www1.example CNAME www2.example\n"
|
|
|
ccb6e0 |
"address: 192.0.2.1\n");
|
|
|
ccb6e0 |
}
|
|
|
ccb6e0 |
|