From nobody Sun Feb 8 22:35:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563015553; cv=none; d=zoho.com; s=zohoarc; b=ImNrw7hKxKgsZZiNYUa4/WldMigzNVl5nprgdvQf12cvzLj5aL/CGW6WU7BvZg9WUWsVmWuSjofhvK2M12gMNysgAd1nCiddnmT3InmODAD5YTVydb+dGw25oheuCWUNkxgpErQTDAmcP9aeKi4OwM2rdHTVNDIyT/XS93hbSlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563015553; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PQXXiRNEHhQGiLxKU5JgyT31YVlArP3e0VT53M/GUqw=; b=dvPMBkS3+fQremxJ7/3h4gmNnnjFUqb3fxuhkm1pEfjKcopjqwMzNGZ5q/J4G9g7cvHAF1pBWGnvpTsgGN3siMzHrSKQM49TBEDQKY7bmLV6p5KNcV6IRpwddzhwLC2tFW5951cdpfPN5+b4aEQbj030gNf4WcU+MX/+W2rkoxQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1563015553466533.2960870375634; Sat, 13 Jul 2019 03:59:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E113530BC595; Sat, 13 Jul 2019 10:59:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC88E196A0; Sat, 13 Jul 2019 10:59:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7F2BA18184A4; Sat, 13 Jul 2019 10:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6DAwsTl010248 for ; Sat, 13 Jul 2019 06:58:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 55CB7196A0; Sat, 13 Jul 2019 10:58:54 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 281CE19699; Sat, 13 Jul 2019 10:58:52 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Sat, 13 Jul 2019 12:58:38 +0200 Message-Id: <34130559f6c7ff29bb0a57f53f76372559cfcb8c.1563015448.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: abologna@redhat.com Subject: [libvirt] [PATCH 5/5] libvirt_nss: Report newer addresses first X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Sat, 13 Jul 2019 10:59:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Ideally, a software that's translating domain names would iterate over all addresses the NSS returned, but some software does not bother (e.g. ping). What happens is that for instance when installing a guest, it's assigned one IP address but once it's installed and rebooted it gets a different IP address (because client ID used for the first DHCP traffic when installing the guest was generated dynamically and never saved so after reboot the guest generated new ID which resulted in different IP address to be assigned). This results in 'ping $domain' not working properly as it still pings the old IP address. Well, it might - NSS plugin does not guarantee any order of addresses. To resolve this problem, we can sort the array just before returning it to the caller (ping) so that the newer IP addresses come before older ones. Reported-by: Andrea Bolognani Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- tests/nssdata/virbr0.status | 6 +++--- tests/nsstest.c | 21 ++++++++------------- tools/nss/libvirt_nss.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/tests/nssdata/virbr0.status b/tests/nssdata/virbr0.status index d040774269..783efb1dfb 100644 --- a/tests/nssdata/virbr0.status +++ b/tests/nssdata/virbr0.status @@ -3,19 +3,19 @@ "ip-address": "192.168.122.197", "mac-address": "52:54:00:a4:6f:91", "hostname": "fedora", - "expiry-time": 1900000000 + "expiry-time": 1900000003 }, { "ip-address": "192.168.122.198", "mac-address": "52:54:00:a4:6f:92", "hostname": "fedora", - "expiry-time": 1900000000 + "expiry-time": 1900000002 }, { "ip-address": "192.168.122.254", "mac-address": "52:54:00:3a:b5:0c", "hostname": "gentoo", - "expiry-time": 2000000000 + "expiry-time": 2000000001 }, { "ip-address": "192.168.122.2", diff --git a/tests/nsstest.c b/tests/nsstest.c index d43c59c4a2..4118c31cef 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -46,7 +46,7 @@ testGetHostByName(const void *opaque) char buf[BUF_SIZE] =3D { 0 }; char **addrList; int rv, tmp_errno =3D 0, tmp_herrno =3D 0; - size_t i =3D 0, j =3D 0; + size_t i =3D 0; =20 memset(&resolved, 0, sizeof(resolved)); =20 @@ -117,6 +117,7 @@ testGetHostByName(const void *opaque) } =20 addrList =3D resolved.h_addr_list; + i =3D 0; while (*addrList) { virSocketAddr sa; char *ipAddr; @@ -135,14 +136,10 @@ testGetHostByName(const void *opaque) goto cleanup; } =20 - for (j =3D 0; data->ipAddr[j]; j++) { - if (STREQ(data->ipAddr[j], ipAddr)) - break; - } - - if (!data->ipAddr[j]) { + if (STRNEQ_NULLABLE(data->ipAddr[i], ipAddr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "Unexpected address %s", ipAddr); + "Unexpected address %s, expecting %s", + ipAddr, NULLSTR(data->ipAddr[i])); VIR_FREE(ipAddr); goto cleanup; } @@ -152,12 +149,10 @@ testGetHostByName(const void *opaque) i++; } =20 - for (j =3D 0; data->ipAddr[j]; j++) - ; - - if (i !=3D j) { + if (data->ipAddr[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - "Expected %zu addresses, got %zu", j, i); + "Expected %s address, got NULL", + data->ipAddr[i]); goto cleanup; } =20 diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index b0e118bf37..519046a4e0 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -76,9 +76,29 @@ do { \ typedef struct { unsigned char addr[16]; int af; + long long expirytime; } leaseAddress; =20 =20 +static int +leaseAddressSorter(const void *a, + const void *b) +{ + const leaseAddress *la =3D a; + const leaseAddress *lb =3D b; + + return lb->expirytime - la->expirytime; +} + + +static void +sortAddr(leaseAddress *tmpAddress, + size_t ntmpAddress) +{ + qsort(tmpAddress, ntmpAddress, sizeof(*tmpAddress), leaseAddressSorter= ); +} + + static int appendAddr(const char *name ATTRIBUTE_UNUSED, leaseAddress **tmpAddress, @@ -89,6 +109,7 @@ appendAddr(const char *name ATTRIBUTE_UNUSED, const char *ipAddr; virSocketAddr sa; int family; + long long expirytime; size_t i; =20 if (!(ipAddr =3D virJSONValueObjectGetString(lease, "ip-address"))) { @@ -109,6 +130,12 @@ appendAddr(const char *name ATTRIBUTE_UNUSED, return 0; } =20 + if (virJSONValueObjectGetNumberLong(lease, "expiry-time", &expirytime)= < 0) { + /* A lease cannot be present without expiry-time */ + ERROR("expiry-time field missing for %s", name); + return -1; + } + for (i =3D 0; i < *ntmpAddress; i++) { if (memcmp((*tmpAddress)[i].addr, (family =3D=3D AF_INET ? @@ -125,6 +152,7 @@ appendAddr(const char *name ATTRIBUTE_UNUSED, return -1; } =20 + (*tmpAddress)[*ntmpAddress].expirytime =3D expirytime; (*tmpAddress)[*ntmpAddress].af =3D family; memcpy((*tmpAddress)[*ntmpAddress].addr, (family =3D=3D AF_INET ? @@ -325,6 +353,8 @@ findLease(const char *name, =20 #endif /* defined(LIBVIRT_NSS_GUEST) */ =20 + sortAddr(tmpAddress, ntmpAddress); + VIR_STEAL_PTR(*address, tmpAddress); *naddress =3D ntmpAddress; ntmpAddress =3D 0; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list