From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id CC20E5A0323 for ; Wed, 14 Aug 2024 06:31:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1723609853; bh=g1090ZgZVpy67X1SOMxhULdxREvyNsPdUmlKh6Y6bIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ekkL3BA1xN8lgzLkN/QADSkTUdch2ncoYQAKHHzpiwsfOhidtO7+Mo2hKq1Kpv6PD gN9oMOK1083vS2IsLFvrBijFwQHhkQtkL9u4AGobnnRh8RHQL+ewUm3bQ054HC4M95 w2Qoa7o8OQrJjs3s70VaIc/hKM7fl4LP5yBsaKKAthJ3GP/6G0Tx6/42IVt2IULKFd QUlPTw6uT6Bb6sUslXvks10RkKEHCG6Gpjf6uV5tbVaSHsqSufv7zpj8N/45isTmz6 F05W8eqD1wNpNqbvXVoirTuK8lzF6NQcVeUwTKafc+jozFmgZqoG7BmwDs8oMg1qWn QJcJ8c/5fEAyQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4WkFgK1zlhz4xCW; Wed, 14 Aug 2024 14:30:53 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 07/16] conf: More accurately count entries added in get_dns() Date: Wed, 14 Aug 2024 14:30:41 +1000 Message-ID: <20240814043050.4177037-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240814043050.4177037-1-david@gibson.dropbear.id.au> References: <20240814043050.4177037-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: IZ6C7HWCKNK5MB3IHZOBC3QVZPDQUDRE X-Message-ID-Hash: IZ6C7HWCKNK5MB3IHZOBC3QVZPDQUDRE X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: get_dns() counts the number of guest DNS servers it adds, and gives an error if it couldn't add any. However, this count ignores the fact that add_dns[46]() may in some cases *not* add an entry. Use the array indices we're already tracking to get an accurate count. Signed-off-by: David Gibson --- conf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/conf.c b/conf.c index 286b3e9f..db036a75 100644 --- a/conf.c +++ b/conf.c @@ -427,7 +427,6 @@ static void get_dns(struct ctx *c) struct lineread resolvconf; struct in6_addr dns6_tmp; struct in_addr dns4_tmp; - unsigned int added = 0; ssize_t line_len; char *line, *end; const char *p; @@ -455,16 +454,12 @@ static void get_dns(struct ctx *c) *end = 0; if (!dns4_set && dns4_idx < ARRAY_SIZE(c->ip4.dns) - 1 - && inet_pton(AF_INET, p + 1, &dns4_tmp)) { + && inet_pton(AF_INET, p + 1, &dns4_tmp)) dns4_idx += add_dns4(c, &dns4_tmp, dns4_idx); - added++; - } if (!dns6_set && dns6_idx < ARRAY_SIZE(c->ip6.dns) - 1 - && inet_pton(AF_INET6, p + 1, &dns6_tmp)) { + && inet_pton(AF_INET6, p + 1, &dns6_tmp)) dns6_idx += add_dns6(c, &dns6_tmp, dns6_idx); - added++; - } } else if (!dnss_set && strstr(line, "search ") == line && s == c->dns_search) { end = strpbrk(line, "\n"); @@ -491,7 +486,7 @@ static void get_dns(struct ctx *c) out: if (!dns_set) { - if (!added) + if (!(dns4_idx + dns6_idx)) warn("Couldn't get any nameserver address"); if (c->no_dhcp_dns) -- 2.46.0