From nobody Mon Feb 9 21:20:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1593056094; cv=none; d=zohomail.com; s=zohoarc; b=QeuK939cpu7+ewNL4srnoZkWIruWGLfoBFNfV20DfV1nfvXWt7O5BvAdkbVOmaHdY8u8FCQpLxcdw9Bp0BZAAyFqLPynGT2qIavh4pb4eymbcgDQiCyeU4B1tzyAasZfutw6gpB9KIcJmHHgtqCVzSQJnUebu7UV+7isfiJfpR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593056094; 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=kxTGmcUxZyRFhdov49tXeAwUrQaxRihZbU9ZbTXtFhs=; b=RuncIeg7xb3VeytDy4QvwnlLbSR5JO8z+kgmxf0d4i78OknJFGLmM8L6O48Vq5fmEaSwKkL6HayWWltIDgN3w84y/REW0fS/VrNBO0JT4nKGyx9sTeYhU1A3Mld1cjO50uJBj7bu1TiKJZImJJppEbVKfKxXnok+KOqaYAdEfxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1593056094759157.16192664864036; Wed, 24 Jun 2020 20:34:54 -0700 (PDT) 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-259-IPUGLhTpPxmijD8AIle5KQ-1; Wed, 24 Jun 2020 23:34:49 -0400 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 2ACF31085984; Thu, 25 Jun 2020 03:34:41 +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 0997B9F77; Thu, 25 Jun 2020 03:34:41 +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 D1A76875A9; Thu, 25 Jun 2020 03:34:40 +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 05P3YXC3007909 for ; Wed, 24 Jun 2020 23:34:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 03FEE7FD07; Thu, 25 Jun 2020 03:34:33 +0000 (UTC) Received: from vhost2.laine.org (ovpn-114-28.phx2.redhat.com [10.3.114.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id B47105BAC6 for ; Thu, 25 Jun 2020 03:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593056093; 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=kxTGmcUxZyRFhdov49tXeAwUrQaxRihZbU9ZbTXtFhs=; b=TCqWy8u4Wk5J41u4ea5Pnqz/RQ4Gpyuz1nmmI26Ey4ymt3yriyom8wMPprWRVAyosJfqoz AVldUR2GiVV8DSQczS+12EgmXDBKqX23UHi1yWAZA1nONXfqYvZEL/PLOcssNVujZerQ8v zC0OxDpYqaq/YunvBeFYnlS+d0+/cxA= X-MC-Unique: IPUGLhTpPxmijD8AIle5KQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 18/25] nwfilter: define a typedef for struct ebtablesSubChainInst Date: Wed, 24 Jun 2020 23:34:07 -0400 Message-Id: <20200625033414.1819594-19-laine@redhat.com> In-Reply-To: <20200625033414.1819594-1-laine@redhat.com> References: <20200625033414.1819594-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 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" Signed-off-by: Laine Stump --- src/nwfilter/nwfilter_ebiptables_driver.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 8b77578117..cc814235aa 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3274,7 +3274,9 @@ ebtablesRuleInstCommand(virFirewallPtr fw, return ret; } =20 -struct ebtablesSubChainInst { +typedef struct _ebtablesSubChainInst ebtablesSubChainInst; +typedef ebtablesSubChainInst *ebtablesSubChainInstPtr; +struct _ebtablesSubChainInst { virNWFilterChainPriority priority; bool incoming; enum l3_proto_idx protoidx; @@ -3285,8 +3287,8 @@ struct ebtablesSubChainInst { static int ebtablesSubChainInstSort(const void *a, const void *b) { - const struct ebtablesSubChainInst **insta =3D (const struct ebtablesSu= bChainInst **)a; - const struct ebtablesSubChainInst **instb =3D (const struct ebtablesSu= bChainInst **)b; + const ebtablesSubChainInst **insta =3D (const ebtablesSubChainInst **)= a; + const ebtablesSubChainInst **instb =3D (const ebtablesSubChainInst **)= b; =20 /* priorities are limited to range [-1000, 1000] */ return (*insta)->priority - (*instb)->priority; @@ -3296,7 +3298,7 @@ ebtablesSubChainInstSort(const void *a, const void *b) static int ebtablesGetSubChainInsts(virHashTablePtr chains, bool incoming, - struct ebtablesSubChainInst ***insts, + ebtablesSubChainInstPtr **insts, size_t *ninsts) { virHashKeyValuePairPtr filter_names; @@ -3309,7 +3311,7 @@ ebtablesGetSubChainInsts(virHashTablePtr chains, return -1; =20 for (i =3D 0; filter_names[i].key; i++) { - struct ebtablesSubChainInst *inst; + ebtablesSubChainInstPtr inst; enum l3_proto_idx idx =3D ebtablesGetProtoIdxByFiltername( filter_names[i].key); =20 @@ -3355,7 +3357,7 @@ ebiptablesApplyNewRules(const char *ifname, bool haveEbtables =3D false; bool haveIptables =3D false; bool haveIp6tables =3D false; - struct ebtablesSubChainInst **subchains =3D NULL; + ebtablesSubChainInstPtr *subchains =3D NULL; size_t nsubchains =3D 0; int ret =3D -1; =20 --=20 2.25.4