From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZzmyO-0004Oy-I6 for mharc-grub-devel@gnu.org; Fri, 20 Nov 2015 09:47:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzmyL-0004Of-QO for grub-devel@gnu.org; Fri, 20 Nov 2015 09:47:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzmyG-0006Nu-QT for grub-devel@gnu.org; Fri, 20 Nov 2015 09:47:33 -0500 Received: from mail-lf0-x22a.google.com ([2a00:1450:4010:c07::22a]:33683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzmyG-0006Nq-Iu for grub-devel@gnu.org; Fri, 20 Nov 2015 09:47:28 -0500 Received: by lfaz4 with SMTP id z4so70461194lfa.0 for ; Fri, 20 Nov 2015 06:47:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=DEYN7o5UcLFo4IjUWGOOq3fUA0+TCMQq36h5slC+NbY=; b=m1vRAJ/Xr2rG9/qiQEzVkKFOhjXmQaGw6naLY5qLDx6r/Y1iep6F55As58yr/Y4e07 nItvRcMiwDyUrU+7l93j26eWuEJaM2g91WWKg8s5PpChPd/+dyWhH810EcW7RjlEogDH UKRXr1z782fvTqJ6CV4YFIega69uaSQ+oh9CBPMNjIvxxfzHsIYJLIS20RJ3wreAs6Cx kOVUKJrkKlv9u4TYBEInwzt1IafT+jA10GfE0fs0kdR8ogZ4wG+kRfxZ5/Mw79bkb7zB MzsTPdM1daDihbf4JjTmaJAEh95A8n7LOPrIxwYFoOZ1N/dbH3GOFQ7lJ5ZRYauyXT6u myTQ== X-Received: by 10.25.168.6 with SMTP id r6mr6157810lfe.94.1448030847655; Fri, 20 Nov 2015 06:47:27 -0800 (PST) Received: from [192.168.1.41] (ppp91-76-25-247.pppoe.mtu-net.ru. [91.76.25.247]) by smtp.gmail.com with ESMTPSA id ki2sm1956930lbc.15.2015.11.20.06.47.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Nov 2015 06:47:27 -0800 (PST) Subject: Re: [PATCH] net: reset nb->data per dns record lookup loop To: grub-devel@gnu.org, Josef Bacik References: <1447787251-1433231-1-git-send-email-jbacik@fb.com> <564B8636.3060004@gmail.com> From: Andrei Borzenkov Message-ID: <564F327E.3060801@gmail.com> Date: Fri, 20 Nov 2015 17:47:26 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <564B8636.3060004@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::22a X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2015 14:47:34 -0000 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 >> --- >> 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))) >> >