From nobody Wed Feb 11 03:24:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1770721830; cv=none; d=zohomail.com; s=zohoarc; b=c80x9FHJUz339PD4uiCHzj6GcslCRbdWaF24zKSr3vwXO7X6gzxAYRFZrRmW+0nf/C4BdseG6KfjhJTvph+we8PiCWkGQzBu67y59+Om9Z6U0RV+AIHjpc4ffswXYUrjSXS+kJsowIrHafn+fH2bMjtpz5Z+CTwTD7ijYH43boI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770721830; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=HIxeiiw6IG8gEga5+SLjjeZ2tFQUxb128oWkv54qZAY=; b=n/feiNSorNWWNRt1YGqJ7T4sOp7QcMCao9hEeTbt0/87z0Skku73TXExnSEX4TBhFsE+ZjyPbHtGdLtdJx2cd+ZcWMnmeluvTQaN5dE6y476P8O+mdj3NykabObnUt2J1fw4jF9jy58rucuBVjXmi5k5fvYqCdNwuSj3Q9gu12c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1770721830187510.27245955436763; Tue, 10 Feb 2026 03:10:30 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 20E5A442A7; Tue, 10 Feb 2026 06:10:29 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2CA243F34D; Tue, 10 Feb 2026 06:01:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9B11C4185F; Tue, 10 Feb 2026 05:18:07 -0500 (EST) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 906B74413B for ; Tue, 10 Feb 2026 05:16:56 -0500 (EST) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-65a1970b912so358136a12.1 for ; Tue, 10 Feb 2026 02:16:56 -0800 (PST) Received: from thinkiepadje.. ([217.21.255.154]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8eda74a515sm492331466b.2.2026.02.10.02.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Feb 2026 02:16:54 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770718615; x=1771323415; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HIxeiiw6IG8gEga5+SLjjeZ2tFQUxb128oWkv54qZAY=; b=dX7QaFZYuI5XGVhuTW+fBUY9t8slsplzoWGjK2TzzsBYujtiJCn3Xcd/zeVTn6YaA1 6EPvwan5B5IapWvU5JsCkRmOE7Am5pKgbgdKCq5+biMGVE+5XhGXry9DR10jSAZNi4Ir yhbCccQOU2JkbU4RHvEALBX0PUfDnmRJBmQ8wfSFxAaeg4ZGIzjOKKr4CSJQrvnzwVUL R3pswT9FR80bHIbaHgcPzulp+ifsag4OpDBJjBTS5V4gf3yp79OoY4x2nQ1PlpgcFF+t AAd3kwHaDPHQDo0U9BlJn6ekfiPs1NGGGMfTC/2x1mgvhJMHazeVtv8dnzjeXNyUVtiy F4wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770718615; x=1771323415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HIxeiiw6IG8gEga5+SLjjeZ2tFQUxb128oWkv54qZAY=; b=cJQGzf+24guHNH7mIp0MJvSHaZ+qEil7c83VJMq74cWf0IRGt+XjLW0noJ8MfcVolu fGxx2GGSIIWjm6kl91skaZJ5pTZvbLTt+IbObF4/rn4t6nYT2oTqO+loHKbZnKvs86SL RtTGgRDUYv44YSSWDbXZC/BGLsR4O86cttNBNUAyx+Bpe5gQxbYoAKLZNAuxa893ogeX gl0zmMNgpEG+TQNSUTpvXzU6+KFbEAR1IW4ATgGc8dD3/bUdagqwhh0sovXqEAO7S54W si51n05A6z3OKAfr+8aXpErn0yAF++IK3yxLkT8mI+uWulstd8SgQyH1CIBXgWQjXpSJ 8xwg== X-Gm-Message-State: AOJu0YywQhQ4Yk7vF3/CsIdIMJ9+vIj4Lp30ucM2yl/oF9nDnVkHQ3kL UxxXLLzjcE6X6pDB2LjQe/5K4N2xigvQJB3kIC6wkduV/4y7rrZ7Cy4to4vn X-Gm-Gg: AZuq6aJ55GMp7NLwKoCYnxRQMiWZNSA7Dv2QBCqfkizehtNOhgI4aNsonxErGEo9x9u R80IVoU7v7G1tOH76R4Ex5mG5V8z2zaZs6R4MRVsROmx0dSngZ+n6wwAd/0G5TF1XKgmNYS4/06 aO2pB/aLsNc8N4uQn+OYPRlFr03j2FPHP87dK5ASDwo5jZtlMsOXSk+fpnveQK2RNQKxt6dlsQH n2wa4PTMuCKvFZnh+m1/LPnX5rAwhRhMLqp+a8jE06+lIIY/oVU831W4ediik8f/a4ZbdZzX7Zc MvlVbJfw152PO8wjq9B/LXvLPKmqCBh1muPNwyqYTNz2jw9GGSuNZ65gOfLwXPZs4jfDYFLNpOt h566Dv7Rrysx3YrRgi2HBxRzyE4epundmbNXUZ07tCjhE8cZkxOHLqNdFglIQZ7KV/AgftoIVoW syz2zO0FAhcCQ7RLCFoxROIjVd8cioNLJW X-Received: by 2002:a17:907:e98a:b0:b79:eba9:83b4 with SMTP id a640c23a62f3a-b8f510d48bfmr115303766b.6.1770718614922; Tue, 10 Feb 2026 02:16:54 -0800 (PST) From: Dion Bosschieter To: devel@lists.libvirt.org Subject: [PATCH v4 1/5] nwfilter: rename generic names to virNWFilter* and CamelCase Date: Tue, 10 Feb 2026 11:16:25 +0100 Message-ID: <20260210101629.1084065-2-dionbosschieter@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260210101629.1084065-1-dionbosschieter@gmail.com> References: <20260210101629.1084065-1-dionbosschieter@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZXZRYUNI3JBZCE4EKS5QPK4XU3KJOO74 X-Message-ID-Hash: ZXZRYUNI3JBZCE4EKS5QPK4XU3KJOO74 X-MailFrom: dionbosschieter@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: jean-louis@dupond.be, Dion Bosschieter X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: <> List-Archive: <> List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1770721831469158500 Content-Type: text/plain; charset="utf-8" Rename generic nwfilter data types and functions to virNWFilter prefix and convert them to CamelCase. These data types and functions are quite common to any nwfilter driver implementation. Prior to moving them out of the nwfilter_ebiptables_driver.c file, we'll first rename them. Signed-off-by: Dion Bosschieter --- src/nwfilter/nwfilter_ebiptables_driver.c | 464 +++++++++++----------- 1 file changed, 232 insertions(+), 232 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 859347409c..c7f6141cd9 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -83,39 +83,39 @@ static void ebiptablesDriverShutdown(void); static int ebtablesCleanAll(const char *ifname); static int ebiptablesAllTeardown(const char *ifname); =20 -struct ushort_map { +struct virNWFilterUShortMap { unsigned short attr; const char *val; }; =20 =20 -enum l3_proto_idx { - L3_PROTO_IPV4_IDX =3D 0, - L3_PROTO_IPV6_IDX, - L3_PROTO_ARP_IDX, - L3_PROTO_RARP_IDX, - L2_PROTO_MAC_IDX, - L2_PROTO_VLAN_IDX, - L2_PROTO_STP_IDX, - L3_PROTO_LAST_IDX +enum virNWFilterProtoIdx { + VIR_NWFILTER_PROTO_IDX_IPV4 =3D 0, + VIR_NWFILTER_PROTO_IDX_IPV6, + VIR_NWFILTER_PROTO_IDX_ARP, + VIR_NWFILTER_PROTO_IDX_RARP, + VIR_NWFILTER_PROTO_IDX_MAC, + VIR_NWFILTER_PROTO_IDX_VLAN, + VIR_NWFILTER_PROTO_IDX_STP, + VIR_NWFILTER_PROTO_IDX_LAST }; =20 -#define USHORTMAP_ENTRY_IDX(IDX, ATT, VAL) [IDX] =3D { .attr =3D ATT, .val= =3D VAL } +#define virNWFilterUShortMapEntryIdx(IDX, ATT, VAL) [IDX] =3D { .attr =3D = ATT, .val =3D VAL } =20 /* A lookup table for translating ethernet protocol IDs to human readable * strings. None of the human readable strings must be found as a prefix * in another entry here (example 'ab' would be found in 'abc') to allow * for prefix matching. */ -static const struct ushort_map l3_protocols[] =3D { - USHORTMAP_ENTRY_IDX(L3_PROTO_IPV4_IDX, ETHERTYPE_IP, "ipv4"), - USHORTMAP_ENTRY_IDX(L3_PROTO_IPV6_IDX, ETHERTYPE_IPV6, "ipv6"), - USHORTMAP_ENTRY_IDX(L3_PROTO_ARP_IDX, ETHERTYPE_ARP, "arp"), - USHORTMAP_ENTRY_IDX(L3_PROTO_RARP_IDX, ETHERTYPE_REVARP, "rarp"), - USHORTMAP_ENTRY_IDX(L2_PROTO_VLAN_IDX, ETHERTYPE_VLAN, "vlan"), - USHORTMAP_ENTRY_IDX(L2_PROTO_STP_IDX, 0, "stp"), - USHORTMAP_ENTRY_IDX(L2_PROTO_MAC_IDX, 0, "mac"), - USHORTMAP_ENTRY_IDX(L3_PROTO_LAST_IDX, 0, NULL), +static const struct virNWFilterUShortMap l3_protocols[] =3D { + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_IPV4, ETHERTYPE_IP= , "ipv4"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_IPV6, ETHERTYPE_IP= V6, "ipv6"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_ARP, ETHERTYPE_AR= P, "arp"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_RARP, ETHERTYPE_RE= VARP, "rarp"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_VLAN, ETHERTYPE_VL= AN, "vlan"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_STP, 0, = "stp"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_MAC, 0, = "mac"), + virNWFilterUShortMapEntryIdx(VIR_NWFILTER_PROTO_IDX_LAST, 0, = NULL), }; =20 =20 @@ -141,7 +141,7 @@ typedef struct { const char *ifname; int nrules; virNWFilterRuleInst **rules; -} chainCreateCallbackData; +} virNWFilterChainCreateCallbackData; =20 static iptablesBaseChainFW fw_base_chains[] =3D { {"FORWARD", "1", VIRT_IN_CHAIN}, @@ -151,10 +151,10 @@ static iptablesBaseChainFW fw_base_chains[] =3D { }; =20 static int -printVar(virNWFilterVarCombIter *vars, - char *buf, int bufsize, - nwItemDesc *item, - bool *done) +virNWFilterPrintVar(virNWFilterVarCombIter *vars, + char *buf, int bufsize, + nwItemDesc *item, + bool *done) { *done =3D false; =20 @@ -184,7 +184,7 @@ printVar(virNWFilterVarCombIter *vars, =20 =20 static int -_printDataType(virNWFilterVarCombIter *vars, +_virNWFilterPrintDataType(virNWFilterVarCombIter *vars, char *buf, int bufsize, nwItemDesc *item, bool asHex, bool directionIn) @@ -195,7 +195,7 @@ _printDataType(virNWFilterVarCombIter *vars, g_auto(virBuffer) vb =3D VIR_BUFFER_INITIALIZER; g_autofree char *flags =3D NULL; =20 - if (printVar(vars, buf, bufsize, item, &done) < 0) + if (virNWFilterPrintVar(vars, buf, bufsize, item, &done) < 0) return -1; =20 if (done) @@ -327,27 +327,27 @@ _printDataType(virNWFilterVarCombIter *vars, =20 =20 static int -printDataType(virNWFilterVarCombIter *vars, - char *buf, int bufsize, - nwItemDesc *item) +virNWFilterPrintDataType(virNWFilterVarCombIter *vars, + char *buf, int bufsize, + nwItemDesc *item) { - return _printDataType(vars, buf, bufsize, item, 0, 0); + return _virNWFilterPrintDataType(vars, buf, bufsize, item, 0, 0); } =20 static int -printDataTypeDirection(virNWFilterVarCombIter *vars, - char *buf, int bufsize, - nwItemDesc *item, bool directionIn) +virNWFilterPrintDataTypeDirection(virNWFilterVarCombIter *vars, + char *buf, int bufsize, + nwItemDesc *item, bool directionIn) { - return _printDataType(vars, buf, bufsize, item, 0, directionIn); + return _virNWFilterPrintDataType(vars, buf, bufsize, item, 0, directio= nIn); } =20 static int -printDataTypeAsHex(virNWFilterVarCombIter *vars, - char *buf, int bufsize, - nwItemDesc *item) +virNWFilterPrintDataTypeAsHex(virNWFilterVarCombIter *vars, + char *buf, int bufsize, + nwItemDesc *item) { - return _printDataType(vars, buf, bufsize, item, 1, 0); + return _virNWFilterPrintDataType(vars, buf, bufsize, item, 1, 0); } =20 =20 @@ -362,9 +362,9 @@ ebtablesHandleEthHdr(virFirewall *fw, char macmask[VIR_MAC_STRING_BUFLEN]; =20 if (HAS_ENTRY_ITEM(ðHdr->dataSrcMACAddr)) { - if (printDataType(vars, - macaddr, sizeof(macaddr), - ðHdr->dataSrcMACAddr) < 0) + if (virNWFilterPrintDataType(vars, + macaddr, sizeof(macaddr), + ðHdr->dataSrcMACAddr) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -374,9 +374,9 @@ ebtablesHandleEthHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(ðHdr->dataSrcMACMask)) { - if (printDataType(vars, - macmask, sizeof(macmask), - ðHdr->dataSrcMACMask) < 0) + if (virNWFilterPrintDataType(vars, + macmask, sizeof(macmask), + ðHdr->dataSrcMACMask) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -387,9 +387,9 @@ ebtablesHandleEthHdr(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(ðHdr->dataDstMACAddr)) { - if (printDataType(vars, - macaddr, sizeof(macaddr), - ðHdr->dataDstMACAddr) < 0) + if (virNWFilterPrintDataType(vars, + macaddr, sizeof(macaddr), + ðHdr->dataDstMACAddr) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -399,9 +399,9 @@ ebtablesHandleEthHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(ðHdr->dataDstMACMask)) { - if (printDataType(vars, - macmask, sizeof(macmask), - ðHdr->dataDstMACMask) < 0) + if (virNWFilterPrintDataType(vars, + macmask, sizeof(macmask), + ðHdr->dataDstMACMask) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -748,9 +748,9 @@ iptablesHandleSrcMacAddr(virFirewall *fw, return 0; } =20 - if (printDataType(vars, - macaddr, sizeof(macaddr), - srcMacAddr) < 0) + if (virNWFilterPrintDataType(vars, + macaddr, sizeof(macaddr), + srcMacAddr) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -792,9 +792,9 @@ iptablesHandleIPHdr(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPAddr)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &ipHdr->dataSrcIPAddr) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &ipHdr->dataSrcIPAddr) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataSrcIPAddr)) @@ -803,9 +803,9 @@ iptablesHandleIPHdr(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPMask)) { =20 - if (printDataType(vars, - number, sizeof(number), - &ipHdr->dataSrcIPMask) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &ipHdr->dataSrcIPMask) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -814,9 +814,9 @@ iptablesHandleIPHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, ipaddr); } } else if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPFrom)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &ipHdr->dataSrcIPFrom) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &ipHdr->dataSrcIPFrom) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -828,9 +828,9 @@ iptablesHandleIPHdr(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPTo)) { =20 - if (printDataType(vars, - ipaddralt, sizeof(ipaddralt), - &ipHdr->dataSrcIPTo) < 0) + if (virNWFilterPrintDataType(vars, + ipaddralt, sizeof(ipaddralt), + &ipHdr->dataSrcIPTo) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -841,9 +841,9 @@ iptablesHandleIPHdr(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&ipHdr->dataDstIPAddr)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &ipHdr->dataDstIPAddr) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &ipHdr->dataDstIPAddr) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataDstIPAddr)) @@ -851,9 +851,9 @@ iptablesHandleIPHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, dst); =20 if (HAS_ENTRY_ITEM(&ipHdr->dataDstIPMask)) { - if (printDataType(vars, - number, sizeof(number), - &ipHdr->dataDstIPMask) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &ipHdr->dataDstIPMask) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -862,9 +862,9 @@ iptablesHandleIPHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, ipaddr); } } else if (HAS_ENTRY_ITEM(&ipHdr->dataDstIPFrom)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &ipHdr->dataDstIPFrom) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &ipHdr->dataDstIPFrom) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -875,9 +875,9 @@ iptablesHandleIPHdr(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, dstrange); =20 if (HAS_ENTRY_ITEM(&ipHdr->dataDstIPTo)) { - if (printDataType(vars, - ipaddralt, sizeof(ipaddralt), - &ipHdr->dataDstIPTo) < 0) + if (virNWFilterPrintDataType(vars, + ipaddralt, sizeof(ipaddralt), + &ipHdr->dataDstIPTo) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -888,9 +888,9 @@ iptablesHandleIPHdr(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&ipHdr->dataDSCP)) { - if (printDataType(vars, - number, sizeof(number), - &ipHdr->dataDSCP) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &ipHdr->dataDSCP) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -929,9 +929,9 @@ iptablesHandleIPHdrAfterStateMatch(virFirewall *fw, if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { =20 - if (printDataType(vars, - str, sizeof(str), - &ipHdr->dataIPSet) < 0) + if (virNWFilterPrintDataType(vars, + str, sizeof(str), + &ipHdr->dataIPSet) < 0) return -1; =20 virFirewallCmdAddArgList(fw, fwrule, @@ -939,9 +939,9 @@ iptablesHandleIPHdrAfterStateMatch(virFirewall *fw, "--match-set", str, NULL); =20 - if (printDataTypeDirection(vars, - str, sizeof(str), - &ipHdr->dataIPSetFlags, directionIn) < = 0) + if (virNWFilterPrintDataTypeDirection(vars, + str, sizeof(str), + &ipHdr->dataIPSetFlags, dire= ctionIn) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, str); @@ -949,9 +949,9 @@ iptablesHandleIPHdrAfterStateMatch(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&ipHdr->dataConnlimitAbove)) { if (!directionIn) { - if (printDataType(vars, - number, sizeof(number), - &ipHdr->dataConnlimitAbove) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &ipHdr->dataConnlimitAbove) < 0) return -1; =20 /* place connlimit after potential -m state --state ... @@ -997,9 +997,9 @@ iptablesHandlePortData(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&portData->dataSrcPortStart)) { - if (printDataType(vars, - portstr, sizeof(portstr), - &portData->dataSrcPortStart) < 0) + if (virNWFilterPrintDataType(vars, + portstr, sizeof(portstr), + &portData->dataSrcPortStart) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&portData->dataSrcPortStart)) @@ -1007,9 +1007,9 @@ iptablesHandlePortData(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, sport); =20 if (HAS_ENTRY_ITEM(&portData->dataSrcPortEnd)) { - if (printDataType(vars, - portstralt, sizeof(portstralt), - &portData->dataSrcPortEnd) < 0) + if (virNWFilterPrintDataType(vars, + portstralt, sizeof(portstralt), + &portData->dataSrcPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -1020,9 +1020,9 @@ iptablesHandlePortData(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&portData->dataDstPortStart)) { - if (printDataType(vars, - portstr, sizeof(portstr), - &portData->dataDstPortStart) < 0) + if (virNWFilterPrintDataType(vars, + portstr, sizeof(portstr), + &portData->dataDstPortStart) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&portData->dataDstPortStart)) @@ -1030,9 +1030,9 @@ iptablesHandlePortData(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, dport); =20 if (HAS_ENTRY_ITEM(&portData->dataDstPortEnd)) { - if (printDataType(vars, - portstralt, sizeof(portstralt), - &portData->dataDstPortEnd) < 0) + if (virNWFilterPrintDataType(vars, + portstralt, sizeof(portstralt), + &portData->dataDstPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -1154,9 +1154,9 @@ _iptablesCreateRuleInstance(virFirewall *fw, return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPOption)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.tcpHdrFilter.dataTCPOption) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.tcpHdrFilter.dataTCPOpti= on) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.tcpHdrFilter.dataTCPOption)) @@ -1346,9 +1346,9 @@ _iptablesCreateRuleInstance(virFirewall *fw, else parm =3D "--icmpv6-type"; =20 - if (printDataType(vars, - number, sizeof(number), - &rule->p.icmpHdrFilter.dataICMPType) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.icmpHdrFilter.dataICMPTy= pe) < 0) return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.icmpHdrFilter.dataICMPType)) @@ -1356,9 +1356,9 @@ _iptablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, parm); =20 if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPCode)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.icmpHdrFilter.dataICMPCode) < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.icmpHdrFilter.dataIC= MPCode) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -1743,9 +1743,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 #define INST_ITEM(STRUCT, ITEM, CLI) \ if (HAS_ENTRY_ITEM(&rule->p.STRUCT.ITEM)) { \ - if (printDataType(vars, \ - field, sizeof(field), \ - &rule->p.STRUCT.ITEM) < 0) \ + if (virNWFilterPrintDataType(vars, \ + field, sizeof(field), \ + &rule->p.STRUCT.ITEM) < 0) \ return -1; \ virFirewallCmdAddArg(fw, fwrule, CLI); \ if (ENTRY_WANT_NEG_SIGN(&rule->p.STRUCT.ITEM)) \ @@ -1755,17 +1755,17 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 #define INST_ITEM_2PARMS(STRUCT, ITEM, ITEM_HI, CLI, SEP) \ if (HAS_ENTRY_ITEM(&rule->p.STRUCT.ITEM)) { \ - if (printDataType(vars, \ - field, sizeof(field), \ - &rule->p.STRUCT.ITEM) < 0) \ + if (virNWFilterPrintDataType(vars, \ + field, sizeof(field), \ + &rule->p.STRUCT.ITEM) < 0) \ return -1; \ virFirewallCmdAddArg(fw, fwrule, CLI); \ if (ENTRY_WANT_NEG_SIGN(&rule->p.STRUCT.ITEM)) \ virFirewallCmdAddArg(fw, fwrule, "!"); \ if (HAS_ENTRY_ITEM(&rule->p.STRUCT.ITEM_HI)) { \ - if (printDataType(vars, \ - fieldalt, sizeof(fieldalt), \ - &rule->p.STRUCT.ITEM_HI) < 0) \ + if (virNWFilterPrintDataType(vars, \ + fieldalt, sizeof(fieldalt), \ + &rule->p.STRUCT.ITEM_HI) < 0)= \ return -1; \ virFirewallCmdAddArgFormat(fw, fwrule, \ "%s%s%s", field, SEP, fieldalt)= ; \ @@ -1791,9 +1791,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.ethHdrFilter.dataProtocolID)) { - if (printDataTypeAsHex(vars, - number, sizeof(number), - &rule->p.ethHdrFilter.dataProtocolID) <= 0) + if (virNWFilterPrintDataTypeAsHex(vars, + number, sizeof(number), + &rule->p.ethHdrFilter.dataPr= otocolID) < 0) return -1; virFirewallCmdAddArg(fw, fwrule, "-p"); if (ENTRY_WANT_NEG_SIGN(&rule->p.ethHdrFilter.dataProtocolID)) @@ -1879,13 +1879,13 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "-p"); virFirewallCmdAddArgFormat(fw, fwrule, "0x%x", (rule->prtclType =3D=3D VIR_NWFILTER_RU= LE_PROTOCOL_ARP) - ? l3_protocols[L3_PROTO_ARP_IDX].attr - : l3_protocols[L3_PROTO_RARP_IDX].attr); + ? l3_protocols[VIR_NWFILTER_PROTO_IDX_A= RP].attr + : l3_protocols[VIR_NWFILTER_PROTO_IDX_R= ARP].attr); =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataHWType)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.arpHdrFilter.dataHWType) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.arpHdrFilter.dataHWType)= < 0) return -1; virFirewallCmdAddArg(fw, fwrule, "--arp-htype"); if (ENTRY_WANT_NEG_SIGN(&rule->p.arpHdrFilter.dataHWType)) @@ -1894,9 +1894,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataOpcode)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.arpHdrFilter.dataOpcode) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.arpHdrFilter.dataOpcode)= < 0) return -1; virFirewallCmdAddArg(fw, fwrule, "--arp-opcode"); if (ENTRY_WANT_NEG_SIGN(&rule->p.arpHdrFilter.dataOpcode)) @@ -1905,9 +1905,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataProtocolType)) { - if (printDataTypeAsHex(vars, - number, sizeof(number), - &rule->p.arpHdrFilter.dataProtocolType)= < 0) + if (virNWFilterPrintDataTypeAsHex(vars, + number, sizeof(number), + &rule->p.arpHdrFilter.dataPr= otocolType) < 0) return -1; virFirewallCmdAddArg(fw, fwrule, "--arp-ptype"); if (ENTRY_WANT_NEG_SIGN(&rule->p.arpHdrFilter.dataProtocolType= )) @@ -1916,15 +1916,15 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPSrcIPAddr)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &rule->p.arpHdrFilter.dataARPSrcIPAddr) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &rule->p.arpHdrFilter.dataARPSrcI= PAddr) < 0) return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPSrcIPMask)) { - if (printDataType(vars, - ipmask, sizeof(ipmask), - &rule->p.arpHdrFilter.dataARPSrcIPMask) = < 0) + if (virNWFilterPrintDataType(vars, + ipmask, sizeof(ipmask), + &rule->p.arpHdrFilter.dataARP= SrcIPMask) < 0) return -1; hasMask =3D true; } @@ -1938,15 +1938,15 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPDstIPAddr)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &rule->p.arpHdrFilter.dataARPDstIPAddr) < 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &rule->p.arpHdrFilter.dataARPDstI= PAddr) < 0) return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPDstIPMask)) { - if (printDataType(vars, - ipmask, sizeof(ipmask), - &rule->p.arpHdrFilter.dataARPDstIPMask) = < 0) + if (virNWFilterPrintDataType(vars, + ipmask, sizeof(ipmask), + &rule->p.arpHdrFilter.dataARP= DstIPMask) < 0) return -1; hasMask =3D true; } @@ -1960,9 +1960,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPSrcMACAddr)) { - if (printDataType(vars, - macaddr, sizeof(macaddr), - &rule->p.arpHdrFilter.dataARPSrcMACAddr) < 0) + if (virNWFilterPrintDataType(vars, + macaddr, sizeof(macaddr), + &rule->p.arpHdrFilter.dataARPSrcM= ACAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -1973,9 +1973,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPDstMACAddr)) { - if (printDataType(vars, - macaddr, sizeof(macaddr), - &rule->p.arpHdrFilter.dataARPDstMACAddr) < 0) + if (virNWFilterPrintDataType(vars, + macaddr, sizeof(macaddr), + &rule->p.arpHdrFilter.dataARPDstM= ACAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2007,9 +2007,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, "-p", "ipv4", NULL); =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataSrcIPAddr)) { - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &rule->p.ipHdrFilter.ipHdr.dataSrcIPAddr) < = 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &rule->p.ipHdrFilter.ipHdr.dataSr= cIPAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2018,9 +2018,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataSrcIPMask)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.ipHdr.dataSrcIPMask= ) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.ipHdr.da= taSrcIPMask) < 0) return -1; virFirewallCmdAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -2031,9 +2031,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataDstIPAddr)) { =20 - if (printDataType(vars, - ipaddr, sizeof(ipaddr), - &rule->p.ipHdrFilter.ipHdr.dataDstIPAddr) < = 0) + if (virNWFilterPrintDataType(vars, + ipaddr, sizeof(ipaddr), + &rule->p.ipHdrFilter.ipHdr.dataDs= tIPAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2042,9 +2042,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataDstIPMask)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.ipHdr.dataDstIPMask= ) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.ipHdr.da= taDstIPMask) < 0) return -1; virFirewallCmdAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -2054,9 +2054,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataProtocolID)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.ipHdr.dataProtocolID) <= 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.ipHdr.dataPr= otocolID) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, "--ip-protocol"); @@ -2066,9 +2066,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.portData.dataSrcPortStart)= ) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.portData.dataSrcPortSta= rt) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.portData.dat= aSrcPortStart) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2077,9 +2077,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.portData.dataSrcPortEn= d)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipHdrFilter.portData.dataSrcPor= tEnd) < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipHdrFilter.portData= .dataSrcPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -2090,9 +2090,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.portData.dataDstPortStart)= ) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.portData.dataDstPortSta= rt) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.portData.dat= aDstPortStart) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2101,9 +2101,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.portData.dataDstPortEn= d)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipHdrFilter.portData.dataDstPor= tEnd) < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipHdrFilter.portData= .dataDstPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -2114,9 +2114,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataDSCP)) { - if (printDataTypeAsHex(vars, - number, sizeof(number), - &rule->p.ipHdrFilter.ipHdr.dataDSCP) < = 0) + if (virNWFilterPrintDataTypeAsHex(vars, + number, sizeof(number), + &rule->p.ipHdrFilter.ipHdr.d= ataDSCP) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, "--ip-tos"); @@ -2140,9 +2140,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, "-p", "ipv6", NULL); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.ipHdr.dataSrcIPAddr)) { - if (printDataType(vars, - ipv6addr, sizeof(ipv6addr), - &rule->p.ipv6HdrFilter.ipHdr.dataSrcIPAddr) = < 0) + if (virNWFilterPrintDataType(vars, + ipv6addr, sizeof(ipv6addr), + &rule->p.ipv6HdrFilter.ipHdr.data= SrcIPAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2151,9 +2151,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.ipHdr.dataSrcIPMask)= ) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.ipHdr.dataSrcIPMa= sk) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.ipHdr.= dataSrcIPMask) < 0) return -1; virFirewallCmdAddArgFormat(fw, fwrule, "%s/%s", ipv6addr, number); @@ -2164,9 +2164,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.ipHdr.dataDstIPAddr)) { =20 - if (printDataType(vars, - ipv6addr, sizeof(ipv6addr), - &rule->p.ipv6HdrFilter.ipHdr.dataDstIPAddr) = < 0) + if (virNWFilterPrintDataType(vars, + ipv6addr, sizeof(ipv6addr), + &rule->p.ipv6HdrFilter.ipHdr.data= DstIPAddr) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2175,9 +2175,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.ipHdr.dataDstIPMask)= ) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.ipHdr.dataDstIPMa= sk) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.ipHdr.= dataDstIPMask) < 0) return -1; virFirewallCmdAddArgFormat(fw, fwrule, "%s/%s", ipv6addr, number); @@ -2187,9 +2187,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, } =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.ipHdr.dataProtocolID)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.ipHdr.dataProtocolID)= < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.ipHdr.data= ProtocolID) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, "--ip6-protocol"); @@ -2200,9 +2200,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.portData.dataSrcPortStar= t)) { =20 - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.portData.dataSrcPortS= tart) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.portData.d= ataSrcPortStart) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2211,9 +2211,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.portData.dataSrcPort= End)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipv6HdrFilter.portData.dataSrcP= ortEnd) < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipv6HdrFilter.portDa= ta.dataSrcPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -2225,9 +2225,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.portData.dataDstPortStar= t)) { =20 - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.portData.dataDstPortS= tart) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.portData.d= ataDstPortStart) < 0) return -1; =20 virFirewallCmdAddArg(fw, fwrule, @@ -2236,9 +2236,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virFirewallCmdAddArg(fw, fwrule, "!"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.portData.dataDstPort= End)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipv6HdrFilter.portData.dataDstP= ortEnd) < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipv6HdrFilter.portDa= ta.dataDstPortEnd) < 0) return -1; =20 virFirewallCmdAddArgFormat(fw, fwrule, @@ -2260,9 +2260,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, "--ip6-icmp-type"); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.dataICMPTypeStart)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.dataICMPTypeStart= ) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.dataIC= MPTypeStart) < 0) return -1; lo =3D true; } else { @@ -2272,9 +2272,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virBufferStrcat(&buf, number, ":", NULL); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.dataICMPTypeEnd)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipv6HdrFilter.dataICMPTypeEnd) = < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipv6HdrFilter.dataIC= MPTypeEnd) < 0) return -1; } else { if (lo) @@ -2288,9 +2288,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, lo =3D false; =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.dataICMPCodeStart)) { - if (printDataType(vars, - number, sizeof(number), - &rule->p.ipv6HdrFilter.dataICMPCodeStart= ) < 0) + if (virNWFilterPrintDataType(vars, + number, sizeof(number), + &rule->p.ipv6HdrFilter.dataIC= MPCodeStart) < 0) return -1; lo =3D true; } else { @@ -2300,9 +2300,9 @@ ebtablesCreateRuleInstance(virFirewall *fw, virBufferStrcat(&buf, number, ":", NULL); =20 if (HAS_ENTRY_ITEM(&rule->p.ipv6HdrFilter.dataICMPCodeEnd)) { - if (printDataType(vars, - numberalt, sizeof(numberalt), - &rule->p.ipv6HdrFilter.dataICMPCodeEnd) = < 0) + if (virNWFilterPrintDataType(vars, + numberalt, sizeof(numberalt), + &rule->p.ipv6HdrFilter.dataIC= MPCodeEnd) < 0) return -1; } else { if (lo) @@ -2550,7 +2550,7 @@ static void ebtablesCreateTmpSubChainFW(virFirewall *fw, bool incoming, const char *ifname, - enum l3_proto_idx protoidx, + enum virNWFilterProtoIdx protoidx, const char *filtername) { char rootchain[MAX_CHAINNAME_LENGTH], chain[MAX_CHAINNAME_LENGTH]; @@ -2575,9 +2575,9 @@ ebtablesCreateTmpSubChainFW(virFirewall *fw, "-t", "nat", "-A", rootchain, NULL); =20 switch ((int)protoidx) { - case L2_PROTO_MAC_IDX: + case VIR_NWFILTER_PROTO_IDX_MAC: break; - case L2_PROTO_STP_IDX: + case VIR_NWFILTER_PROTO_IDX_STP: virFirewallCmdAddArgList(fw, fwrule, "-d", NWFILTER_MAC_BGA, NULL); break; @@ -3132,12 +3132,12 @@ iptablesCheckBridgeNFCallEnabled(bool isIPv6) * Given a filtername determine the protocol it is used for evaluating * We do prefix-matching to determine the protocol. */ -static enum l3_proto_idx +static enum virNWFilterProtoIdx ebtablesGetProtoIdxByFiltername(const char *filtername) { - enum l3_proto_idx idx; + enum virNWFilterProtoIdx idx; =20 - for (idx =3D 0; idx < L3_PROTO_LAST_IDX; idx++) { + for (idx =3D 0; idx < VIR_NWFILTER_PROTO_IDX_LAST; idx++) { if (STRPREFIX(filtername, l3_protocols[idx].val)) return idx; } @@ -3190,7 +3190,7 @@ iptablesHandleCreateChainAndRules(virFirewall *fw, { size_t i, j; static bool baseChainDefined[G_N_ELEMENTS(fw_base_chains)] =3D { false= }; - chainCreateCallbackData *cbdata =3D opaque; + virNWFilterChainCreateCallbackData *cbdata =3D opaque; bool isIPv6 =3D layer =3D=3D VIR_FIREWALL_LAYER_IPV6; =20 iptablesUnlinkTmpRootChainsFW(fw, layer, cbdata->ifname); @@ -3271,7 +3271,7 @@ iptablesHandleCreateChainAndRules(virFirewall *fw, */ static void iptablesCreateChainsAndRules(virFirewall *fw, virFirewallLayer layer, - chainCreateCallbackData *cbdata) + virNWFilterChainCreateCallbackData *cbdat= a) { virFirewallAddCmdFull(fw, layer, false, iptablesHandleCreateChainAndRules, @@ -3319,7 +3319,7 @@ typedef struct _ebtablesSubChainInst ebtablesSubChain= Inst; struct _ebtablesSubChainInst { virNWFilterChainPriority priority; bool incoming; - enum l3_proto_idx protoidx; + enum virNWFilterProtoIdx protoidx; const char *filtername; }; =20 @@ -3356,7 +3356,7 @@ ebtablesGetSubChainInsts(GHashTable *chains, =20 for (i =3D 0; filter_names[i].key; i++) { g_autofree ebtablesSubChainInst *inst =3D NULL; - enum l3_proto_idx idx =3D ebtablesGetProtoIdxByFiltername( + enum virNWFilterProtoIdx idx =3D ebtablesGetProtoIdxByFiltername( filter_names[i].key); =20 if ((int)idx < 0) @@ -3389,7 +3389,7 @@ ebiptablesApplyNewRules(const char *ifname, g_autofree ebtablesSubChainInst **subchains =3D NULL; size_t nsubchains =3D 0; int ret =3D -1; - chainCreateCallbackData chainCallbackData =3D {ifname, nrules, rules}; + virNWFilterChainCreateCallbackData chainCallbackData =3D {ifname, nrul= es, rules}; =20 if (nrules) { g_qsort_with_data(rules, nrules, sizeof(rules[0]), --=20 2.43.0