From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZymLx-0008BA-Q6 for mharc-grub-devel@gnu.org; Tue, 17 Nov 2015 14:55:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZymLv-0008AK-93 for grub-devel@gnu.org; Tue, 17 Nov 2015 14:55:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZymLq-0006uE-9G for grub-devel@gnu.org; Tue, 17 Nov 2015 14:55:43 -0500 Received: from mail-lb0-x22b.google.com ([2a00:1450:4010:c04::22b]:34727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZymLp-0006u7-Hz for grub-devel@gnu.org; Tue, 17 Nov 2015 14:55:37 -0500 Received: by lbbcs9 with SMTP id cs9so12180421lbb.1 for ; Tue, 17 Nov 2015 11:55:36 -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=XqaVPc6UTeojDuIzlN2YZq7RTSVHJS2Dhy7wxbrq3wM=; b=YqRoWKZODsLGZCaXz4+xNnzcuKk7BQTmqTQLhuJVwvkqGJZZj7jy3/FbZFSV7HnsFj MSK3uj4SmJb02jlPETbikuCJgLlXClZVw1ZSEIyh0sbVhqWEHgrMowxLjEDdevcoIoY7 +AXYc5FHFGE083W3TVZk9jEpwPzNLa9oqRZ7DYILdhbAulrg3OPK60o14A6zxiwz5VYB hbqF/QD7Bt9JFdyZqcjwgD26upneQvT6Qahtji30C/UmLOAHEj8XI5c7rLjq/Wg3Huhv lz/UjeYJHFbRMl7g/BI/Ya2QQsuGE+U2tau0lw1nfCDYAv78vcSuMWI+4eBs66P4OQDr TIBQ== X-Received: by 10.112.138.138 with SMTP id qq10mr21174047lbb.45.1447790136411; Tue, 17 Nov 2015 11:55:36 -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 j189sm1724712lfg.46.2015.11.17.11.55.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Nov 2015 11:55:35 -0800 (PST) Subject: Re: [PATCH] net: reset nb->data per dns record lookup loop To: grub-devel@gnu.org References: <1447787251-1433231-1-git-send-email-jbacik@fb.com> From: Andrei Borzenkov Message-ID: <564B8636.3060004@gmail.com> Date: Tue, 17 Nov 2015 22:55:34 +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: <1447787251-1433231-1-git-send-email-jbacik@fb.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:c04::22b 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: Tue, 17 Nov 2015 19:55:44 -0000 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))) >