grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bootp: use the ipv* version given by the dhcp server
@ 2016-02-24 19:10 Josef Bacik
  2016-02-27 18:05 ` Andrei Borzenkov
  0 siblings, 1 reply; 4+ messages in thread
From: Josef Bacik @ 2016-02-24 19:10 UTC (permalink / raw)
  To: kernel-team, grub-devel

We were setting DNS_OPTION_PREVER_IPV* based on which version of the dhcp
request we go back.  However this would mean that we would mistakenly fall back
on ipv4 in an ipv6 only system, or vice versa.  For the sake of simplicity lets
only use the ip version for the dns server we got in our dhcp response.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
 grub-core/net/bootp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
index 345ad7a..cde818c 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -95,7 +95,7 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
 		struct grub_net_network_level_address s;
 		s.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
 		s.ipv4 = grub_get_unaligned32 (ptr);
-		s.option = DNS_OPTION_PREFER_IPV4;
+		s.option = DNS_OPTION_IPV4;
 		grub_net_add_dns_server (&s);
 		ptr += 4;
 	      }
@@ -492,7 +492,7 @@ get_dhcpv6_dns_address (const struct grub_net_dhcpv6_packet *packet,
       (la + i)->type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
       (la + i)->ipv6[0] = grub_get_unaligned64 (pa);
       (la + i)->ipv6[1] = grub_get_unaligned64 (pa + 8);
-      (la + i)->option = DNS_OPTION_PREFER_IPV6;
+      (la + i)->option = DNS_OPTION_IPV6;
     }
 
   *addr = la;
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-01 19:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-24 19:10 [PATCH] bootp: use the ipv* version given by the dhcp server Josef Bacik
2016-02-27 18:05 ` Andrei Borzenkov
2016-03-01 16:34   ` Josef Bacik
2016-03-01 19:35     ` Andrei Borzenkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).