Attachment 618761 Details for Bug 860829 – Workaround to fix DNS lookup (ipv4 only)

Workaround to fix DNS lookup (ipv4 only)

dns.patch (text/plain), 1.86 KB, created by IBM Bug Proxy on 2012-09-28 21:00:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2012-09-28 21:00:43 UTC

Size: 1.86 KB

patch

obsolete

>From d4cf584915f510fc74eaa0ea193363673972e902 Mon Sep 17 00:00:00 2001
>From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
>Date: Fri, 28 Sep 2012 19:42:07 -0400
>Subject: [PATCH] Drop ipv6 DNS question from query
>
>This is a workaround/proof of concept for the multiple questions per query
>issue: https://bugzilla.redhat.com/show_bug.cgi?id=860829
>
>---
> grub-core/net/dns.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
>diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
>index 3381ea7..0c66ad6 100644
>--- a/grub-core/net/dns.c
>+++ b/grub-core/net/dns.c
>@@ -471,8 +471,7 @@ grub_net_dns_lookup (const char *name,
> 			   + GRUB_NET_MAX_LINK_HEADER_SIZE
> 			   + GRUB_NET_UDP_HEADER_SIZE
> 			   + sizeof (struct dns_header)
>-			   + grub_strlen (name) + 2 + 4
>-			   + 2 + 4);
>+			   + grub_strlen (name) + 2 + 4);
>   if (!nb)
>     {
>       grub_free (data.name);
>@@ -482,7 +481,7 @@ grub_net_dns_lookup (const char *name,
> 			+ GRUB_NET_MAX_LINK_HEADER_SIZE
> 			+ GRUB_NET_UDP_HEADER_SIZE);
>   grub_netbuff_put (nb, sizeof (struct dns_header)
>-		    + grub_strlen (name) + 2 + 4 + 2 + 4);
>+		    + grub_strlen (name) + 2 + 4);
>   head = (struct dns_header *) nb->data;
>   optr = (grub_uint8_t *) (head + 1);
>   for (iptr = name; *iptr; )
>@@ -515,21 +514,10 @@ grub_net_dns_lookup (const char *name,
>   *optr++ = 0;
>   *optr++ = 1;
> 
>-  /* Compressed name.  */
>-  *optr++ = 0xc0;
>-  *optr++ = 0x0c;
>-  /* Type: AAAA.  */
>-  *optr++ = 0;
>-  *optr++ = 28;
>-
>-  /* Class.  */
>-  *optr++ = 0;
>-  *optr++ = 1;
>-
>   head->id = data.id;
>   head->flags = FLAGS_RD;
>   head->ra_z_r_code = 0;
>-  head->qdcount = grub_cpu_to_be16_compile_time (2);
>+  head->qdcount = grub_cpu_to_be16_compile_time (1);
>   head->ancount = grub_cpu_to_be16_compile_time (0);
>   head->nscount = grub_cpu_to_be16_compile_time (0);
>   head->arcount = grub_cpu_to_be16_compile_time (0);
>-- 
>1.7.11.4
>

Actions: View

Attachments on bug 860829: 618761 | 628205