From nobody Sun May 19 02:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1646386369; cv=none; d=zohomail.com; s=zohoarc; b=TPyGKRl4sf9UWt6hB2thWipwEbthE/5W3sbVVzYJ5dbApNv3aNr+jM+gwxGiJY/YgFs0lKkzzkFgbY/5/geslL1/BRtHH27pawpzu2utv/Tsh19KE8P4w92EK80ruEdvS3qi5akoiphT4onU+tJVXhNtbPy+uDxseSdNxl2Z0+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646386369; h=Content-Type:Content-Transfer-Encoding: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; bh=tvcNGJtGejHBl5WX4DkmaIOfev80ubRhIkbslsC3YM8=; b=nPwR4aLTJVQAQflOpnlQUA32n+PRCEQrixD7kF4ci+UgWSJE6ozLfmqSvbJK2Fwm93lL2wKJ4inJWl5FZob5DpApEGS7tGEBpRQd+3/2VXHYd01PIi3YZsQeWjpG2UkQ07oVk9LOwHKq5pG4ZXD6Jmb/Wuecj72jqnfRy9awZ38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1646386369652230.92154891650887; Fri, 4 Mar 2022 01:32:49 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-360-lwYRLdA7PcqxyPBNKsTCPA-1; Fri, 04 Mar 2022 04:32:45 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74E6C1006AA8; Fri, 4 Mar 2022 09:32:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5476766E34; Fri, 4 Mar 2022 09:32:40 +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 1B2344ED79; Fri, 4 Mar 2022 09:32:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2249W9WJ017736 for ; Fri, 4 Mar 2022 04:32:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id C73826E20F; Fri, 4 Mar 2022 09:32:09 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D60A66E34 for ; Fri, 4 Mar 2022 09:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646386368; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tvcNGJtGejHBl5WX4DkmaIOfev80ubRhIkbslsC3YM8=; b=HniEYHAgRKqielHyLGidd3UwcL/BrPdguDWHwl+S072bsLQc0y49uXB3hYTuoYuuqbv8jq gpe+96iSRiAxb5DFU/7TOtb/hjZzWxqlVYy0VI7wEBs7s0+BuetnRK32Qni4PSd6HOWrqg /Z3RyLHRKipkNdbrdV/ZMZrTCcYVFv4= X-MC-Unique: lwYRLdA7PcqxyPBNKsTCPA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/4] vircgroupmock: Be wiser about detecting fakerootdir change Date: Fri, 4 Mar 2022 10:31:58 +0100 Message-Id: <22905b07cbf2665ab6e3e1f1ed223eb564bbe130.1646386097.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646386370933100002 Content-Type: text/plain; charset="utf-8" The way that vircgroupmock works is that the vircgrouptest creates a temporary directory and sets LIBVIRT_FAKE_ROOT_DIR env variable which is then checked by the mock at the beginning of basically every function it overrides (access(), stat in all its flavours, mkdir(), etc.). The mock then creates a CGroup dir structure. But the test is allowed to change the directory, to accommodate environment for the particular test case. This is done by changing the environment variable which is then detected by the mock and the whole process repeats. However, the way the mock detect changes is buggy. After it got the environment variable it compares it to the last known value (global variable @fakerootdir) and if they don't match the last known value is set to point to the new value. Problem is that the result of getenv() is assigned to the @fakerootdir directly. Therefore, @fakerootdir points somewhere into the buffer of environment variables. In turn, when the test sets new value (via g_setenv()) it may be placed at the very same position in the env var buffer and thus the mock fails to detect the change. The solution is to keep our private copy of the value (by g_strdup()) which makes the variable not rely on getenv()/setenv() placing values at random positions. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- tests/vircgroupmock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index cebf1912f7..cbf5269df6 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -352,7 +352,8 @@ static void init_sysfs(void) if (fakerootdir && STREQ(fakerootdir, newfakerootdir)) return; =20 - fakerootdir =3D newfakerootdir; + VIR_FREE(fakerootdir); + fakerootdir =3D g_strdup(newfakerootdir); =20 mock =3D getenv("VIR_CGROUP_MOCK_MODE"); if (mock) { --=20 2.34.1 From nobody Sun May 19 02:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1646386382; cv=none; d=zohomail.com; s=zohoarc; b=JXbACB9rjU7lhVXPFmOaOU30yUSnJJNRQD7eGw9/WF1ND9Qi/3rJPje9vrcMuGkGpslwm5dPHvlOOLgQZFlVPcEEOChATrQMhROOIk1Ryp1gN3lk2X7dniO/0H5qJvTTT9BhP/FwKvhEtHCjfQdpNhc5UpyfWU3pPrBBiomNBRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646386382; h=Content-Type:Content-Transfer-Encoding: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; bh=W/jsXbZNtnHC8AxkTDbfK52v1OmTGyqH2MMFDbawy+o=; b=h6NVavYlJnAok2bpJ+stOb/vXQ/SBTmONB4RwjBN2FuoY+5P4xhwaWa1IG84i/91lOI/Th1GJ/2szSeirIu50/4446ljhC6Bz9za+g4lOdxfGl/qDyzsckfbnG2BSF0+bkjFRADLYqAxPyABf3N73d2V6AwN6GOVy/7jk78jprI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646386382534135.11563691938557; Fri, 4 Mar 2022 01:33:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-Gh2xDw8RM6KUkEyf0BeaJw-1; Fri, 04 Mar 2022 04:32:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD22A824FA8; Fri, 4 Mar 2022 09:32:16 +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 74D0467E7A; Fri, 4 Mar 2022 09:32:15 +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 7445B1809CB2; Fri, 4 Mar 2022 09:32:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2249WAGa017747 for ; Fri, 4 Mar 2022 04:32:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0A6E6E20F; Fri, 4 Mar 2022 09:32:10 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2255066E34 for ; Fri, 4 Mar 2022 09:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646386381; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=W/jsXbZNtnHC8AxkTDbfK52v1OmTGyqH2MMFDbawy+o=; b=JTlw3OReed7joEZzxO71PN43kA/f5AfR65caYCwZ8tRgYN+hCLsxnRrq2P9xxkrpMx9z6r D2DDKbK+ugET/CGW4xQs3glE1MLKsqh3RlgaS8+1KvqVp4ilDatahLXdVyLHenj7CAFFfM ey297Semr2/dCKbhzIyDedfhWWwBzLY= X-MC-Unique: Gh2xDw8RM6KUkEyf0BeaJw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/4] vircgroupmock: Make global variables static Date: Fri, 4 Mar 2022 10:31:59 +0100 Message-Id: <406be86e724267e2c09285024a2a03c7351352aa.1646386097.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646386383201100001 Content-Type: text/plain; charset="utf-8" Apparently clang was fixed as it no longer considers having global variables static a problem. Make the variables static to be sure they aren't used outside of the source file. This effectively reverts v1.0.6-rc1~198 which started the trend. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- tests/vircgroupmock.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index cbf5269df6..a213c8e686 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -36,14 +36,10 @@ static FILE *(*real_fopen)(const char *path, const char= *mode); static int (*real_access)(const char *path, int mode); static int (*real_mkdir)(const char *path, mode_t mode); =20 -/* Don't make static, since it causes problems with clang - * when passed as an arg to asprintf() - * vircgroupmock.c:462:22: error: static variable 'fakesysfsdir' is used i= n an inline function with external linkage [-Werror,-Wstatic-in-inline] - */ -char *fakerootdir; -char *fakesysfscgroupdir; -const char *fakedevicedir0 =3D FAKEDEVDIR0; -const char *fakedevicedir1 =3D FAKEDEVDIR1; +static char *fakerootdir; +static char *fakesysfscgroupdir; +static const char *fakedevicedir0 =3D FAKEDEVDIR0; +static const char *fakedevicedir1 =3D FAKEDEVDIR1; =20 =20 # define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup" --=20 2.34.1 From nobody Sun May 19 02:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1646386369; cv=none; d=zohomail.com; s=zohoarc; b=IvIpBZ3K2Dg0rI31lErO5RgI5dmrCsufruj/OjM6zA/ul6nVGXsCQhaQxQXvyGYAunsaKJYe7+GWPovE/0NZOcgcTow1cHq1q0124xYFnAPQTXnAPjlBARFMRJsca0c43R/JKIwE7W3LBweyC9DOXXons0fZdXcO3hSuPA2QB8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646386369; h=Content-Type:Content-Transfer-Encoding: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; bh=HOqgy3s+o7muA/+3g6EqsSIZ3E3Mx1PDJ6BB4xjJJ+M=; b=lL+n4O+lGc7tiZLzv3DQ5lzIbH9QZHxTm/3DO+QCbBpgx0zDI06d527IlRTJdZ8nDeWr4WWh8RhrCIfgvpK21yy8IB+HYfps30zUY4e0KqvdgNW5pLtcJkIJrNnAncrRxWB49Oi+1uU2pfdxAw6QkJCaPRA7c2wwuHflLmVUmdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1646386369396152.94693719064867; Fri, 4 Mar 2022 01:32:49 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-WMs5Am9sPqS7smwRsUU3MA-1; Fri, 04 Mar 2022 04:32:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72CAD1006AA7; Fri, 4 Mar 2022 09:32:40 +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 52A8F691B5; Fri, 4 Mar 2022 09:32:40 +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 1AE781808814; Fri, 4 Mar 2022 09:32:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2249WBJc017760 for ; Fri, 4 Mar 2022 04:32:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 74EF26E20F; Fri, 4 Mar 2022 09:32:11 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF92866E34 for ; Fri, 4 Mar 2022 09:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646386369; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HOqgy3s+o7muA/+3g6EqsSIZ3E3Mx1PDJ6BB4xjJJ+M=; b=DxLkhY9V/nrYQ8yCfyQ9K74MGQ2gXzhlFsVFyxOLIyHZt4k2wYJJ32DHey6tDPKgbghHeR jJOslldlklFASGpIsJtqADfodSTKR0u5gOGHAlI3t/Yh16XJW68gOjei5WlYQ+QSG5HZij fJtR+I0kjYnC3aC7YXXWUWUnwCAr+Gw= X-MC-Unique: WMs5Am9sPqS7smwRsUU3MA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/4] sockettest: Check for IPv4-in-IPv6 parsing and formatting Date: Fri, 4 Mar 2022 10:32:00 +0100 Message-Id: <42816a23e5ffaef36417be4c56e1a7bb94f50d76.1646386097.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646386370925100001 Content-Type: text/plain; charset="utf-8" There are two standards how IPv4 address in IPv6 can be expressed: ::10.1.2.3 ::ffff:10.1.2.3 The former is obsolete and the latter should be used instead [1]. Add test cases to our sockettest to exercise parsing/formatting of the valid address format. 1: https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5.1 Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- tests/sockettest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sockettest.c b/tests/sockettest.c index 332def2c93..2a35b6a829 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -371,12 +371,14 @@ mymain(void) DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.2.0.0", AF_INET, false); DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.0.3", AF_INET, true); DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.3.0", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("::ffff:a01:203", "::ffff:10.1.2.3", AF= _INET6, true); =20 DO_TEST_PARSE_AND_FORMAT("::1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET, false); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET6, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_UNIX, false); DO_TEST_PARSE_AND_FORMAT("::fffe:0:0", AF_UNSPEC, true); + DO_TEST_PARSE_AND_FORMAT("::ffff:10.1.2.3", AF_UNSPEC, true); =20 /* tests that specify a network that should contain the range */ DO_TEST_RANGE("192.168.122.1", "192.168.122.1", "192.168.122.1", 24, 1= , true); --=20 2.34.1 From nobody Sun May 19 02:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1646386345; cv=none; d=zohomail.com; s=zohoarc; b=OmixX7P9W0q2QbplACphLfZfOiUuRKaYwGRl6LEKlcXfOeULCqd7IGtaJwzMdDaQz5mQVqjq0WQNt+hdgQc8sV5EBJB0EBLsyu9JeTQnjo/MKrWlK1d4DYNLvOyAMIcl2oZgjyBINMGQ6DzuwRbIww6xqlJFUaL5JHPT/9YHR/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646386345; h=Content-Type:Content-Transfer-Encoding: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; bh=vOuhkLyhBw9C2GVuuhy8CcJqtqUP+BUCsUm4s4ki7OA=; b=SWeM9AuqHaFrRACmOJTz8R4km5/t+WH7ZDy9r/k7UYY0xvYDw0Jy1ydYqMTM8E6j8/UdRipikGfsGrQPUpq3WmCecq94attfi6dzPQ0ckIaOKZDykzvj0T1/X46QRtpRVxOzb8dTaeaGBRvF4qsQ+bC3WBNdDl+WeeVph47DIGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646386345139569.5388458775083; Fri, 4 Mar 2022 01:32:25 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-B6s1oFC0PbCORn6odSqRXQ-1; Fri, 04 Mar 2022 04:32:21 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ACEB31006AA5; Fri, 4 Mar 2022 09:32:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 489F5691B5; Fri, 4 Mar 2022 09:32:16 +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 167474BB40; Fri, 4 Mar 2022 09:32:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2249WCq5017765 for ; Fri, 4 Mar 2022 04:32:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7198866E34; Fri, 4 Mar 2022 09:32:12 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4528710C1 for ; Fri, 4 Mar 2022 09:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646386343; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vOuhkLyhBw9C2GVuuhy8CcJqtqUP+BUCsUm4s4ki7OA=; b=KcjSndOpWz5xEtPIB7yCJWyxEkItlvGzL7kg+VrerVclLmzqSz1HPNFVUQ1zQyN5e41VFm iSRtVFqnV/i10gDOAcRg9jAYNP/wvneaDaaRhOri5M1NzLMGi7peW16YgZ95pQa0i+Kojd aSIZyCUwujm4QCDsB4k85c1v1/YbkFY= X-MC-Unique: B6s1oFC0PbCORn6odSqRXQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/4] tests: Update IPv4-in-IPv6 addresses Date: Fri, 4 Mar 2022 10:32:01 +0100 Message-Id: <3347fec5363b65bd721c0808ad2f693b5e587e49.1646386097.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646386346760100005 Content-Type: text/plain; charset="utf-8" We have couple of tests where the obsolete IPv4-in-IPv6 notation is used (::10.1.2.3). Change them to the correct format (::ffff:10.1.2.3). Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- tests/nwfilterxml2firewalldata/ah-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/ah-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/all-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/all-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/comment-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/comment.xml | 4 ++-- tests/nwfilterxml2firewalldata/esp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/esp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/hex-data-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/hex-data.xml | 4 ++-- tests/nwfilterxml2firewalldata/icmpv6-linux.args | 2 +- tests/nwfilterxml2firewalldata/icmpv6.xml | 2 +- tests/nwfilterxml2firewalldata/ipv6-linux.args | 4 ++-- tests/nwfilterxml2firewalldata/ipv6.xml | 4 ++-- tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/sctp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/tcp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/udp-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udp-ipv6.xml | 2 +- tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args | 6 +++--- tests/nwfilterxml2firewalldata/udplite-ipv6.xml | 2 +- tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/comment-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/hex-data-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/ipv6-test-invalid.xml | 4 ++-- tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml | 2 +- tests/nwfilterxml2xmlout/ah-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/all-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/comment-test.xml | 2 +- tests/nwfilterxml2xmlout/esp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/hex-data-test.xml | 2 +- tests/nwfilterxml2xmlout/icmpv6-test.xml | 2 +- tests/nwfilterxml2xmlout/ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/sctp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/tcp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udp-ipv6-test.xml | 2 +- tests/nwfilterxml2xmlout/udplite-ipv6-test.xml | 2 +- 44 files changed, 67 insertions(+), 67 deletions(-) diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfi= lterxml2firewalldata/ah-ipv6-linux.args index 77f0532fd2..f0bf85e8a1 100644 --- a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p ah \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p ah \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p ah \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6.xml b/tests/nwfilterxml= 2firewalldata/ah-ipv6.xml index 95ebbc9e09..b664c0dfa6 100644 --- a/tests/nwfilterxml2firewalldata/ah-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/ah-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwf= ilterxml2firewalldata/all-ipv6-linux.args index d86908663c..5eb6033c64 100644 --- a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p all \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p all \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p all \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/all-ipv6.xml b/tests/nwfilterxm= l2firewalldata/all-ipv6.xml index 5cf3519437..5132e9bdd6 100644 --- a/tests/nwfilterxml2firewalldata/all-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/all-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfi= lterxml2firewalldata/comment-linux.args index c014538f09..2b940ccd84 100644 --- a/tests/nwfilterxml2firewalldata/comment-linux.args +++ b/tests/nwfilterxml2firewalldata/comment-linux.args @@ -25,8 +25,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 6 \ --ip6-source-port 273:400 \ --ip6-destination-port 13107:65535 \ diff --git a/tests/nwfilterxml2firewalldata/comment.xml b/tests/nwfilterxml= 2firewalldata/comment.xml index a154a17c14..f1d2af1908 100644 --- a/tests/nwfilterxml2firewalldata/comment.xml +++ b/tests/nwfilterxml2firewalldata/comment.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwf= ilterxml2firewalldata/hex-data-linux.args index 3c04e1c23d..ff8f528c48 100644 --- a/tests/nwfilterxml2firewalldata/hex-data-linux.args +++ b/tests/nwfilterxml2firewalldata/hex-data-linux.args @@ -25,8 +25,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 6 \ --ip6-source-port 273:400 \ --ip6-destination-port 13107:65535 \ diff --git a/tests/nwfilterxml2firewalldata/hex-data.xml b/tests/nwfilterxm= l2firewalldata/hex-data.xml index 45df45129b..ee93bbccda 100644 --- a/tests/nwfilterxml2firewalldata/hex-data.xml +++ b/tests/nwfilterxml2firewalldata/hex-data.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilte= rxml2firewalldata/ipv6-linux.args index 87db9c2979..a36ae23cf5 100644 --- a/tests/nwfilterxml2firewalldata/ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args @@ -5,8 +5,8 @@ ebtables \ -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ -p ipv6 \ ---ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 \ +--ip6-source ::ffff:10.1.2.3/22 \ +--ip6-destination ::ffff:10.1.2.3/113 \ --ip6-protocol 17 \ --ip6-source-port 20:22 \ --ip6-destination-port 100:101 \ diff --git a/tests/nwfilterxml2firewalldata/ipv6.xml b/tests/nwfilterxml2fi= rewalldata/ipv6.xml index 2400958030..0351bca01a 100644 --- a/tests/nwfilterxml2firewalldata/ipv6.xml +++ b/tests/nwfilterxml2firewalldata/ipv6.xml @@ -3,8 +3,8 @@ diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwf= ilterxml2firewalldata/tcp-ipv6-linux.args index 8fa5e24eff..50b5514a3b 100644 --- a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args @@ -74,7 +74,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p tcp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ @@ -88,7 +88,7 @@ ip6tables \ -p tcp \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --sport 255:256 \ @@ -100,7 +100,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p tcp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml b/tests/nwfilterxm= l2firewalldata/tcp-ipv6.xml index d4f24f44de..2f41b227b3 100644 --- a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/tcp-ipv6.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwf= ilterxml2firewalldata/udp-ipv6-linux.args index 59367ed3d3..6feec12a04 100644 --- a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args @@ -74,7 +74,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p udp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ @@ -88,7 +88,7 @@ ip6tables \ -p udp \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --sport 255:256 \ @@ -100,7 +100,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p udp \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 63 \ --dport 255:256 \ diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6.xml b/tests/nwfilterxm= l2firewalldata/udp-ipv6.xml index fd4f135a4b..7c0be8404e 100644 --- a/tests/nwfilterxml2firewalldata/udp-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/udp-ipv6.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests= /nwfilterxml2firewalldata/udplite-ipv6-linux.args index de564aee36..6be6aa0069 100644 --- a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args @@ -71,7 +71,7 @@ ip6tables \ -w \ -A FJ-vnet0 \ -p udplite \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -83,7 +83,7 @@ ip6tables \ -p udplite \ -m mac \ --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 \ +--source ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ @@ -93,7 +93,7 @@ ip6tables \ -w \ -A HJ-vnet0 \ -p udplite \ ---destination ::10.1.2.3/128 \ +--destination ::ffff:10.1.2.3/128 \ -m dscp \ --dscp 33 \ -m state \ diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml b/tests/nwfilt= erxml2firewalldata/udplite-ipv6.xml index 5b941a2465..1b006e1d42 100644 --- a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml +++ b/tests/nwfilterxml2firewalldata/udplite-ipv6.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml b/tests/nwfil= terxml2xmlin/ah-ipv6-test-invalid.xml index f0200985df..a5bb5e595f 100644 --- a/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml b/tests/nwfi= lterxml2xmlin/all-ipv6-test-invalid.xml index 32772370a8..a162aa1c45 100644 --- a/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlin/comment-test-invalid.xml b/tests/nwfil= terxml2xmlin/comment-test-invalid.xml index 69ba783ce1..c85dbadb0b 100644 --- a/tests/nwfilterxml2xmlin/comment-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/comment-test-invalid.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml b/tests/nwfi= lterxml2xmlin/hex-data-test-invalid.xml index af26a92ae4..e6c9dc4636 100644 --- a/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml @@ -19,8 +19,8 @@ diff --git a/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml b/tests/nwfilter= xml2xmlin/ipv6-test-invalid.xml index 2daa3b96dd..3b420871b2 100644 --- a/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml @@ -3,8 +3,8 @@ diff --git a/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml b/tests/nwfi= lterxml2xmlin/tcp-ipv6-test-invalid.xml index f4340f9ee8..bdc8d6ef23 100644 --- a/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml b/tests/nwfi= lterxml2xmlin/udp-ipv6-test-invalid.xml index f2a73896f2..1f8be92fa0 100644 --- a/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml @@ -14,7 +14,7 @@ diff --git a/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml b/tests/= nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml index 2f2b8d4941..702804ba7c 100644 --- a/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml +++ b/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml @@ -13,7 +13,7 @@ diff --git a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml b/tests/nwfilterxml2= xmlout/ah-ipv6-test.xml index 6d65b3de57..2c4b9c97af 100644 --- a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/ah-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/all-ipv6-test.xml b/tests/nwfilterxml= 2xmlout/all-ipv6-test.xml index 263a679966..226e86bead 100644 --- a/tests/nwfilterxml2xmlout/all-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/all-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/comment-test.xml b/tests/nwfilterxml2= xmlout/comment-test.xml index 1d95af1c27..70779bcb23 100644 --- a/tests/nwfilterxml2xmlout/comment-test.xml +++ b/tests/nwfilterxml2xmlout/comment-test.xml @@ -7,7 +7,7 @@ - + diff --git a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml b/tests/nwfilterxml= 2xmlout/esp-ipv6-test.xml index 3852aaca47..c8744b86d8 100644 --- a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/esp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/hex-data-test.xml b/tests/nwfilterxml= 2xmlout/hex-data-test.xml index 35a125b600..98eeac7152 100644 --- a/tests/nwfilterxml2xmlout/hex-data-test.xml +++ b/tests/nwfilterxml2xmlout/hex-data-test.xml @@ -7,7 +7,7 @@ - + diff --git a/tests/nwfilterxml2xmlout/icmpv6-test.xml b/tests/nwfilterxml2x= mlout/icmpv6-test.xml index 3334038a84..314aad2137 100644 --- a/tests/nwfilterxml2xmlout/icmpv6-test.xml +++ b/tests/nwfilterxml2xmlout/icmpv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/ipv6-test.xml b/tests/nwfilterxml2xml= out/ipv6-test.xml index ce9dd06233..3c5799590a 100644 --- a/tests/nwfilterxml2xmlout/ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/ipv6-test.xml @@ -1,7 +1,7 @@ 5c6d49af-b071-6127-b4ec-6f8ed4b55335 - + diff --git a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml b/tests/nwfilterxm= l2xmlout/sctp-ipv6-test.xml index 3ef8589a00..87c8487257 100644 --- a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml b/tests/nwfilterxml= 2xmlout/tcp-ipv6-test.xml index fcbe7a4a0f..0755c1b75f 100644 --- a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml b/tests/nwfilterxml= 2xmlout/udp-ipv6-test.xml index abcf698169..28b1a93f4d 100644 --- a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/udp-ipv6-test.xml @@ -7,6 +7,6 @@ - + diff --git a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml b/tests/nwfilte= rxml2xmlout/udplite-ipv6-test.xml index 9f41181535..308fb98e6f 100644 --- a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml @@ -7,6 +7,6 @@ - + --=20 2.34.1