[PATCH] net: reset nb->data per dns record lookup loop

[PATCH] net: reset nb->data per dns record lookup loop

[Josef Bacik]

We were resetting nb->data every time we tried a new server, but we need to do
it every time we try for a different record, otherwise we don't end up falling
back to the A record properly.  Thanks,

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

diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
index c356318..9291aec 100644
--- a/grub-core/net/dns.c
+++ b/grub-core/net/dns.c
@@ -570,11 +570,11 @@ grub_net_dns_lookup (const char *name,
           grub_err_t err2;
           if (!sockets[j])
             continue;
-          nb->data = nbd;
 
           grub_size_t t = 0;
           do
             {
+              nb->data = nbd;
               if (servers[j].option == DNS_OPTION_IPV4 ||
                  ((servers[j].option == DNS_OPTION_PREFER_IPV4) && (t++ == 0)) ||
                  ((servers[j].option == DNS_OPTION_PREFER_IPV6) && (t++ == 1)))
-- 
1.8.1

Re: [PATCH] net: reset nb->data per dns record lookup loop

[Andrei Borzenkov]

17.11.2015 22:07, Josef Bacik пишет:
> We were resetting nb->data every time we tried a new server, but we need to do
> it every time we try for a different record, otherwise we don't end up falling
> back to the A record properly.  Thanks,
>
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> ---
>   grub-core/net/dns.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
> index c356318..9291aec 100644
> --- a/grub-core/net/dns.c
> +++ b/grub-core/net/dns.c
> @@ -570,11 +570,11 @@ grub_net_dns_lookup (const char *name,
>             grub_err_t err2;
>             if (!sockets[j])
>               continue;

Could you rebase to current head?

> -          nb->data = nbd;
>
>             grub_size_t t = 0;
>             do
>               {
> +              nb->data = nbd;
>                 if (servers[j].option == DNS_OPTION_IPV4 ||
>                    ((servers[j].option == DNS_OPTION_PREFER_IPV4) && (t++ == 0)) ||
>                    ((servers[j].option == DNS_OPTION_PREFER_IPV6) && (t++ == 1)))
>

Re: [PATCH] net: reset nb->data per dns record lookup loop

[Andrei Borzenkov]

ping

17.11.2015 22:55, Andrei Borzenkov пишет:
> 17.11.2015 22:07, Josef Bacik пишет:
>> We were resetting nb->data every time we tried a new server, but we
>> need to do
>> it every time we try for a different record, otherwise we don't end up
>> falling
>> back to the A record properly.  Thanks,
>>
>> Signed-off-by: Josef Bacik <jbacik@fb.com>
>> ---
>>   grub-core/net/dns.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
>> index c356318..9291aec 100644
>> --- a/grub-core/net/dns.c
>> +++ b/grub-core/net/dns.c
>> @@ -570,11 +570,11 @@ grub_net_dns_lookup (const char *name,
>>             grub_err_t err2;
>>             if (!sockets[j])
>>               continue;
>
> Could you rebase to current head?
>
>> -          nb->data = nbd;
>>
>>             grub_size_t t = 0;
>>             do
>>               {
>> +              nb->data = nbd;
>>                 if (servers[j].option == DNS_OPTION_IPV4 ||
>>                    ((servers[j].option == DNS_OPTION_PREFER_IPV4) &&
>> (t++ == 0)) ||
>>                    ((servers[j].option == DNS_OPTION_PREFER_IPV6) &&
>> (t++ == 1)))
>>
>

Re: [PATCH] net: reset nb->data per dns record lookup loop

[Josef Bacik]

On 11/20/2015 09:47 AM, Andrei Borzenkov wrote:
> ping
>

I'll rebase today, in the middle of something else atm.  Thanks,

Josef