From nobody Tue Feb 10 04:03:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606188659; cv=none; d=zohomail.com; s=zohoarc; b=ZzmWyxv8P5WNDDCtGBr59p99Ab6hkhLdAAV0pGu0dxg5nbOt6aV30GH6PZ2GbToSKcSq5ufcgTuqNpmt+nD9RYE/Mz7c+t/lGl8DyIGb/A+W0gaaWyPGcV8waQkivCFabzpv2QYuGoMsD7pPYDgdahrCi0p1MeSvMRtE38fEoks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606188659; 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=KXD71QZscCjYRVOMoVqvvBxYhbP4hzfoakM3PALkpqU=; b=fGCRO/+/JqPygNyE2OBD2Z1lB6SQXnXgoT648NLd0seMuT2Mt0DjYzNAnBeInIw8QY9Bkg5WK/frcpv8ngh9DyGMYYhsmKXNFsSX0xet4nPHr9PPFgEtooQQItYa+aEWroWpAfdGFZyiOzPIyzYpTqUvYQLVSYgcQv4X7OQa9dI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606188659932403.46638421018713; Mon, 23 Nov 2020 19:30:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-p7YOibzaOWWgy4gR46TdFw-1; Mon, 23 Nov 2020 22:30:56 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9F6A803651; Tue, 24 Nov 2020 03:30:50 +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 980DD60C43; Tue, 24 Nov 2020 03:30:50 +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 610C15002D; Tue, 24 Nov 2020 03:30:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AO3UDU8007387 for ; Mon, 23 Nov 2020 22:30:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id D19DC5D705; Tue, 24 Nov 2020 03:30:13 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-35.phx2.redhat.com [10.3.112.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B64E5D6A1 for ; Tue, 24 Nov 2020 03:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606188658; 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=KXD71QZscCjYRVOMoVqvvBxYhbP4hzfoakM3PALkpqU=; b=Aj7aPmnaP3GeButVyODjk09L8vUdhE65lfSzVL6dvxbqUN3usmAQDJ/Vny7JqjNRk7k65y Ddcn4txvSqIHajHZUccNV0bKh+jp69dvrBRUvnB489CzjUXvf4Z7LrQeMfRZzSjxdNhB+I v6WOrkesIBQy56fI1P0DM0NGaAAOJ2k= X-MC-Unique: p7YOibzaOWWgy4gR46TdFw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 4/8] tests: fix iptables test case commandline options in virfirewalltest.c Date: Mon, 23 Nov 2020 22:30:00 -0500 Message-Id: <20201124033004.1163126-5-laine@redhat.com> In-Reply-To: <20201124033004.1163126-1-laine@redhat.com> References: <20201124033004.1163126-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.12 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) Content-Type: text/plain; charset="utf-8" This test was created with all the commandlines erroneously having "--source-host", which is not a valid iptables option. The correct name for the option is "--source". However, since the test is just checking that the generated commandline matches what we told it to generate (and never actually runs iptables, as that would be a "Really Bad Idea"(tm)), the test has always succeeded. I only found it because I made a change to the code that caused the test to incorrectly try to run iptables during the test, and the error message I received was "odd" (it complained about the bad option, rather than complaining that I had insufficient privilege to run the command). Signed-off-by: Laine Stump --- tests/virfirewalltest.c | 168 ++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index fac7e20c06..fa1838a499 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -186,8 +186,8 @@ testFirewallSingleGroup(const void *opaque) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; =20 fwDisabled =3D data->fwDisabled; @@ -203,12 +203,12 @@ testFirewallSingleGroup(const void *opaque) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) < 0) @@ -238,8 +238,8 @@ testFirewallRemoveRule(const void *opaque) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; virFirewallRulePtr fwrule; =20 @@ -256,17 +256,17 @@ testFirewallRemoveRule(const void *opaque) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 fwrule =3D virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", NULL); - virFirewallRuleAddArg(fw, fwrule, "--source-host"); + virFirewallRuleAddArg(fw, fwrule, "--source"); virFirewallRemoveRule(fw, fwrule); =20 fwrule =3D virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", NULL); - virFirewallRuleAddArg(fw, fwrule, "--source-host"); + virFirewallRuleAddArg(fw, fwrule, "--source"); virFirewallRuleAddArgFormat(fw, fwrule, "%s", "!192.168.122.1"); virFirewallRuleAddArgList(fw, fwrule, "--jump", "REJECT", NULL); =20 @@ -297,9 +297,9 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.1' --jump = REJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source-host 192.168.122.1 --jump AC= CEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJEC= T\n" + IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\= n" IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data =3D opaque; =20 @@ -316,19 +316,19 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUS= ED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "OUTPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -384,9 +384,9 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_U= NUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source-host 192.168.122.1 --jump AC= CEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\= n" IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data =3D opaque; =20 @@ -405,19 +405,19 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC= _UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "OUTPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -452,9 +452,9 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UN= USED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -A OUTPUT --source-host 192.168.122.1 --jump AC= CEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -A OUTPUT --source 192.168.122.1 --jump ACCEPT\= n" IPTABLES_PATH " -w -A OUTPUT --jump DROP\n"; const struct testFirewallData *data =3D opaque; =20 @@ -473,18 +473,18 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_= UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_IPV4, true, NULL, NULL, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "OUTPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, @@ -519,8 +519,8 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n"; const struct testFirewallData *data =3D opaque; =20 fwDisabled =3D data->fwDisabled; @@ -538,17 +538,17 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUS= ED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) =3D=3D 0) { @@ -579,11 +579,11 @@ testFirewallSingleRollback(const void *opaque G_GNUC_= UNUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -D INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; =20 fwDisabled =3D data->fwDisabled; @@ -601,34 +601,34 @@ testFirewallSingleRollback(const void *opaque G_GNUC_= UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 virFirewallStartRollback(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) =3D=3D 0) { @@ -659,10 +659,10 @@ testFirewallManyRollback(const void *opaque G_GNUC_UN= USED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; =20 fwDisabled =3D data->fwDisabled; @@ -680,38 +680,38 @@ testFirewallManyRollback(const void *opaque G_GNUC_UN= USED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallStartRollback(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 virFirewallStartRollback(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) =3D=3D 0) { @@ -742,14 +742,14 @@ testFirewallChainedRollback(const void *opaque G_GNUC= _UNUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.127 --jump R= EJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.1' --jump = REJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host 192.168.122.127 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host '!192.168.122.1' --jump = REJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host 192.168.122.255 --jump R= EJECT\n" - IPTABLES_PATH " -w -D INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.127 --jump REJECT= \n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJEC= T\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source 192.168.122.127 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJEC= T\n" + IPTABLES_PATH " -w -D INPUT --source 192.168.122.255 --jump REJECT= \n" + IPTABLES_PATH " -w -D INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; =20 fwDisabled =3D data->fwDisabled; @@ -767,14 +767,14 @@ testFirewallChainedRollback(const void *opaque G_GNUC= _UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallStartRollback(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 =20 @@ -782,24 +782,24 @@ testFirewallChainedRollback(const void *opaque G_GNUC= _UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.127", + "--source", "192.168.122.127", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 virFirewallStartRollback(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.127", + "--source", "192.168.122.127", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 =20 @@ -807,24 +807,24 @@ testFirewallChainedRollback(const void *opaque G_GNUC= _UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 virFirewallStartRollback(fw, VIR_FIREWALL_ROLLBACK_INHERIT_PREVIOUS); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "192.168.122.255", + "--source", "192.168.122.255", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-D", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) =3D=3D 0) { @@ -906,7 +906,7 @@ testFirewallQueryCallback(virFirewallPtr fw, size_t i; virFirewallAddRule(fw, layer, "-A", "INPUT", - "--source-host", "!192.168.122.129", + "--source", "!192.168.122.129", "--jump", "REJECT", NULL); =20 for (i =3D 0; lines[i] !=3D NULL; i++) { @@ -934,15 +934,15 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) int ret =3D -1; const char *actual =3D NULL; const char *expected =3D - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.1 --jump ACC= EPT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.127 --jump R= EJECT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.127 --jump REJECT= \n" IPTABLES_PATH " -w -L\n" IPTABLES_PATH " -w -t nat -L\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.130 --jump R= EJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.129' --jum= p REJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.129' --jum= p REJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host 192.168.122.128 --jump R= EJECT\n" - IPTABLES_PATH " -w -A INPUT --source-host '!192.168.122.1' --jump = REJECT\n"; + IPTABLES_PATH " -w -A INPUT --source 192.168.122.130 --jump REJECT= \n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.129' --jump REJ= ECT\n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.129' --jump REJ= ECT\n" + IPTABLES_PATH " -w -A INPUT --source 192.168.122.128 --jump REJECT= \n" + IPTABLES_PATH " -w -A INPUT --source '!192.168.122.1' --jump REJEC= T\n"; const struct testFirewallData *data =3D opaque; =20 expectedLineNum =3D 0; @@ -962,14 +962,14 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.1", + "--source", "192.168.122.1", "--jump", "ACCEPT", NULL); =20 virFirewallStartTransaction(fw, 0); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.127", + "--source", "192.168.122.127", "--jump", "REJECT", NULL); =20 virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_IPV4, @@ -985,7 +985,7 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.130", + "--source", "192.168.122.130", "--jump", "REJECT", NULL); =20 =20 @@ -993,12 +993,12 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED) =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "192.168.122.128", + "--source", "192.168.122.128", "--jump", "REJECT", NULL); =20 virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, "-A", "INPUT", - "--source-host", "!192.168.122.1", + "--source", "!192.168.122.1", "--jump", "REJECT", NULL); =20 if (virFirewallApply(fw) < 0) --=20 2.28.0