From nobody Fri Dec 19 20:35:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559938958; cv=none; d=zoho.com; s=zohoarc; b=foT6FwvPoQGmceXyEgGrXLJzvKZkChFkBn87ZFBLViL6h68hleixYCddTNu+2HZO91lBlisP9t2OTvwN/OKIEz9G9W/KfwvBzysDZwLsfUAGXcH8j+bWIKAZseNAqv1lEYbGAPq7AZxTwJ+oY8JHwX/Vop0HF3LQZ/wpw5g+yG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559938958; 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:ARC-Authentication-Results; bh=FZ9I9gbm/ZdWvhTagjaOdMQmU66atZxDZCs9u6Uayso=; b=MvzS8M/etWFokmHDwFGzR+Ft7J2C44JBE/drnTMur5aEeBs34WuMkSoN0CDVgYDxho/ZhOlCBDCQ0byGDM6NlF8ZAq/v/kU2RKuvG9gRxPlPQOKUb6WfaUiGgsUaliGobRh/pWZqy5kCAW0G8cT4Q/7E1JZalaGKk1GsxJLB1t4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1559938958817664.0930530727097; Fri, 7 Jun 2019 13:22:38 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id CE64C59455; Fri, 7 Jun 2019 20:22:36 +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 A7E04608A5; Fri, 7 Jun 2019 20:22:35 +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 6D2D01806B1F; Fri, 7 Jun 2019 20:22:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x57KKeSc025708 for ; Fri, 7 Jun 2019 16:20:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 092435C220; Fri, 7 Jun 2019 20:20:40 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-185.phx2.redhat.com [10.3.117.185]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB6785C205 for ; Fri, 7 Jun 2019 20:20:39 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 15:20:18 -0500 Message-Id: <20190607202030.29625-8-jjongsma@redhat.com> In-Reply-To: <20190607202030.29625-1-jjongsma@redhat.com> References: <20190607202030.29625-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/19] conf: nwfilter: use #pragma once in headers X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 07 Jun 2019 20:22:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma --- src/conf/nwfilter_conf.h | 93 ++++++++++++++-------------- src/conf/nwfilter_ipaddrmap.h | 5 +- src/conf/nwfilter_params.h | 28 ++++----- src/conf/virnwfilterbindingdef.h | 13 ++-- src/conf/virnwfilterbindingobj.h | 11 ++-- src/conf/virnwfilterbindingobjlist.h | 8 +-- src/conf/virnwfilterobj.h | 11 ++-- 7 files changed, 73 insertions(+), 96 deletions(-) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 4366ccc4d1..13db58e380 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -22,18 +22,17 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_CONF_H -# define LIBVIRT_NWFILTER_CONF_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 -# include "virhash.h" -# include "virxml.h" -# include "virbuffer.h" -# include "virsocketaddr.h" -# include "virmacaddr.h" -# include "virdomainobjlist.h" -# include "virenum.h" +#include "virhash.h" +#include "virxml.h" +#include "virbuffer.h" +#include "virsocketaddr.h" +#include "virmacaddr.h" +#include "virdomainobjlist.h" +#include "virenum.h" =20 /* XXX * The config parser/structs should not be using platform specific @@ -41,21 +40,21 @@ * so temporarily define them until this can be re-written to use * locally defined enums for all constants */ -# ifndef ETHERTYPE_IP -# define ETHERTYPE_IP 0x0800 -# endif -# ifndef ETHERTYPE_ARP -# define ETHERTYPE_ARP 0x0806 -# endif -# ifndef ETHERTYPE_REVARP -# define ETHERTYPE_REVARP 0x8035 -# endif -# ifndef ETHERTYPE_IPV6 -# define ETHERTYPE_IPV6 0x86dd -# endif -# ifndef ETHERTYPE_VLAN -# define ETHERTYPE_VLAN 0x8100 -# endif +#ifndef ETHERTYPE_IP +# define ETHERTYPE_IP 0x0800 +#endif +#ifndef ETHERTYPE_ARP +# define ETHERTYPE_ARP 0x0806 +#endif +#ifndef ETHERTYPE_REVARP +# define ETHERTYPE_REVARP 0x8035 +#endif +#ifndef ETHERTYPE_IPV6 +# define ETHERTYPE_IPV6 0x86dd +#endif +#ifndef ETHERTYPE_VLAN +# define ETHERTYPE_VLAN 0x8100 +#endif =20 /** * Chain suffix size is: @@ -66,7 +65,7 @@ * terminating '0' =3D * 32-3-15-1-1 =3D 12 */ -# define MAX_CHAIN_SUFFIX_SIZE 12 +#define MAX_CHAIN_SUFFIX_SIZE 12 =20 =20 typedef enum { @@ -76,13 +75,13 @@ typedef enum { } virNWFilterEntryItemFlags; =20 =20 -# define MAX_COMMENT_LENGTH 256 -# define MAX_IPSET_NAME_LENGTH 32 /* incl. terminating '\0' */ +#define MAX_COMMENT_LENGTH 256 +#define MAX_IPSET_NAME_LENGTH 32 /* incl. terminating '\0' */ =20 -# define HAS_ENTRY_ITEM(data) \ +#define HAS_ENTRY_ITEM(data) \ (((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_EXISTS) =20 -# define ENTRY_WANT_NEG_SIGN(data) \ +#define ENTRY_WANT_NEG_SIGN(data) \ (((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_IS_NEG) =20 /* datatypes appearing in rule attributes */ @@ -108,7 +107,7 @@ typedef enum attrDatatype { DATATYPE_LAST =3D (1 << 17), } virNWFilterAttrDataType; =20 -# define NWFILTER_MAC_BGA "01:80:c2:00:00:00" +#define NWFILTER_MAC_BGA "01:80:c2:00:00:00" =20 =20 typedef struct _nwItemDesc nwItemDesc; @@ -138,7 +137,7 @@ struct _nwItemDesc { } u; }; =20 -# define VALID_IPSETNAME \ +#define VALID_IPSETNAME \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:-+ " =20 typedef struct _ethHdrDataDef ethHdrDataDef; @@ -426,20 +425,20 @@ typedef enum { } virNWFilterEbtablesTableType; =20 =20 -# define MIN_RULE_PRIORITY -1000 -# define MAX_RULE_PRIORITY 1000 +#define MIN_RULE_PRIORITY -1000 +#define MAX_RULE_PRIORITY 1000 =20 -# define NWFILTER_MIN_FILTER_PRIORITY -1000 -# define NWFILTER_MAX_FILTER_PRIORITY MAX_RULE_PRIORITY +#define NWFILTER_MIN_FILTER_PRIORITY -1000 +#define NWFILTER_MAX_FILTER_PRIORITY MAX_RULE_PRIORITY =20 -# define NWFILTER_ROOT_FILTER_PRI 0 -# define NWFILTER_STP_FILTER_PRI -810 -# define NWFILTER_MAC_FILTER_PRI -800 -# define NWFILTER_VLAN_FILTER_PRI -750 -# define NWFILTER_IPV4_FILTER_PRI -700 -# define NWFILTER_IPV6_FILTER_PRI -600 -# define NWFILTER_ARP_FILTER_PRI -500 -# define NWFILTER_RARP_FILTER_PRI -400 +#define NWFILTER_ROOT_FILTER_PRI 0 +#define NWFILTER_STP_FILTER_PRI -810 +#define NWFILTER_MAC_FILTER_PRI -800 +#define NWFILTER_VLAN_FILTER_PRI -750 +#define NWFILTER_IPV4_FILTER_PRI -700 +#define NWFILTER_IPV6_FILTER_PRI -600 +#define NWFILTER_ARP_FILTER_PRI -500 +#define NWFILTER_RARP_FILTER_PRI -400 =20 typedef enum { RULE_FLAG_NO_STATEMATCH =3D (1 << 0), @@ -451,7 +450,7 @@ typedef enum { } virNWFilterRuleFlags; =20 =20 -# define IPTABLES_STATE_FLAGS \ +#define IPTABLES_STATE_FLAGS \ (RULE_FLAG_STATE_NEW | \ RULE_FLAG_STATE_ESTABLISHED | \ RULE_FLAG_STATE_RELATED | \ @@ -525,7 +524,7 @@ typedef enum { VIR_NWFILTER_CHAINSUFFIX_LAST, } virNWFilterChainSuffixType; =20 -# define VALID_CHAINNAME \ +#define VALID_CHAINNAME \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:-" =20 typedef int32_t virNWFilterChainPriority; @@ -615,5 +614,3 @@ VIR_ENUM_DECL(virNWFilterJumpTarget); VIR_ENUM_DECL(virNWFilterChainPolicy); VIR_ENUM_DECL(virNWFilterEbtablesTable); VIR_ENUM_DECL(virNWFilterChainSuffix); - -#endif /* LIBVIRT_NWFILTER_CONF_H */ diff --git a/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h index 13e763ae7e..ebb999a29a 100644 --- a/src/conf/nwfilter_ipaddrmap.h +++ b/src/conf/nwfilter_ipaddrmap.h @@ -20,8 +20,7 @@ * */ =20 -#ifndef LIBVIRT_NWFILTER_IPADDRMAP_H -# define LIBVIRT_NWFILTER_IPADDRMAP_H +#pragma once =20 int virNWFilterIPAddrMapInit(void); void virNWFilterIPAddrMapShutdown(void); @@ -30,5 +29,3 @@ int virNWFilterIPAddrMapAddIPAddr(const char *ifname, cha= r *addr); int virNWFilterIPAddrMapDelIPAddr(const char *ifname, const char *ipaddr); virNWFilterVarValuePtr virNWFilterIPAddrMapGetIPAddr(const char *ifname); - -#endif /* LIBVIRT_NWFILTER_IPADDRMAP_H */ diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 9abeeba43a..d51f3f7f9f 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -19,13 +19,12 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_PARAMS_H -# define LIBVIRT_NWFILTER_PARAMS_H +#pragma once =20 -# include "virhash.h" -# include "virbuffer.h" -# include "virmacaddr.h" -# include "virxml.h" +#include "virhash.h" +#include "virbuffer.h" +#include "virmacaddr.h" +#include "virxml.h" =20 typedef enum { NWFILTER_VALUE_TYPE_SIMPLE, @@ -74,16 +73,16 @@ int virNWFilterHashTablePutAll(virHashTablePtr src, bool virNWFilterHashTableEqual(virHashTablePtr a, virHashTablePtr b); =20 -# define VALID_VARNAME \ +#define VALID_VARNAME \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_" =20 -# define VALID_VARVALUE \ +#define VALID_VARVALUE \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:" =20 -# define NWFILTER_VARNAME_IP "IP" -# define NWFILTER_VARNAME_MAC "MAC" -# define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" -# define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" +#define NWFILTER_VARNAME_IP "IP" +#define NWFILTER_VARNAME_MAC "MAC" +#define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" +#define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" =20 typedef enum { VIR_NWFILTER_VAR_ACCESS_ELEMENT =3D 0, @@ -106,7 +105,7 @@ struct _virNWFilterVarAccess { char *varName; }; =20 -# define VIR_NWFILTER_MAX_ITERID 1000 +#define VIR_NWFILTER_MAX_ITERID 1000 =20 void virNWFilterVarAccessFree(virNWFilterVarAccessPtr varAccess); bool virNWFilterVarAccessEqual(const virNWFilterVarAccess *a, @@ -150,6 +149,3 @@ virNWFilterVarCombIterPtr virNWFilterVarCombIterNext( virNWFilterVarCombIterPtr ci); const char *virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci, const virNWFilterVarAccess *= ); - - -#endif /* LIBVIRT_NWFILTER_PARAMS_H */ diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbinding= def.h index 7cd2890b15..3d291fd6bf 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -19,13 +19,12 @@ * */ =20 -#ifndef LIBVIRT_VIRNWFILTERBINDINGDEF_H -# define LIBVIRT_VIRNWFILTERBINDINGDEF_H +#pragma once =20 -# include "internal.h" -# include "virmacaddr.h" -# include "virhash.h" -# include "virbuffer.h" +#include "internal.h" +#include "virmacaddr.h" +#include "virhash.h" +#include "virbuffer.h" =20 typedef struct _virNWFilterBindingDef virNWFilterBindingDef; typedef virNWFilterBindingDef *virNWFilterBindingDefPtr; @@ -62,5 +61,3 @@ virNWFilterBindingDefFormat(const virNWFilterBindingDef *= def); int virNWFilterBindingDefFormatBuf(virBufferPtr buf, const virNWFilterBindingDef *def); - -#endif /* LIBVIRT_VIRNWFILTERBINDINGDEF_H */ diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbinding= obj.h index b26bb3c8ec..2318f042bc 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -19,12 +19,11 @@ * */ =20 -#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJ_H -# define LIBVIRT_VIRNWFILTERBINDINGOBJ_H +#pragma once =20 -# include "internal.h" -# include "virnwfilterbindingdef.h" -# include "virobject.h" +#include "internal.h" +#include "virnwfilterbindingdef.h" +#include "virobject.h" =20 typedef struct _virNWFilterBindingObj virNWFilterBindingObj; typedef virNWFilterBindingObj *virNWFilterBindingObjPtr; @@ -69,5 +68,3 @@ virNWFilterBindingObjParseFile(const char *filename); =20 char * virNWFilterBindingObjFormat(const virNWFilterBindingObj *obj); - -#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJ_H */ diff --git a/src/conf/virnwfilterbindingobjlist.h b/src/conf/virnwfilterbin= dingobjlist.h index b0fb90f667..a819b4cc8a 100644 --- a/src/conf/virnwfilterbindingobjlist.h +++ b/src/conf/virnwfilterbindingobjlist.h @@ -18,10 +18,9 @@ * . */ =20 -#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H -# define LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H +#pragma once =20 -# include "virnwfilterbindingobj.h" +#include "virnwfilterbindingobj.h" =20 typedef struct _virNWFilterBindingObjList virNWFilterBindingObjList; typedef virNWFilterBindingObjList *virNWFilterBindingObjListPtr; @@ -62,6 +61,3 @@ virNWFilterBindingObjListExport(virNWFilterBindingObjList= Ptr bindings, virConnectPtr conn, virNWFilterBindingPtr **bindinglist, virNWFilterBindingObjListACLFilter filter); - - -#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H */ diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 2369c20313..bdf5c51fe2 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -17,13 +17,12 @@ * . */ =20 -#ifndef LIBVIRT_VIRNWFILTEROBJ_H -# define LIBVIRT_VIRNWFILTEROBJ_H +#pragma once =20 -# include "internal.h" +#include "internal.h" =20 -# include "nwfilter_conf.h" -# include "virnwfilterbindingobjlist.h" +#include "nwfilter_conf.h" +#include "virnwfilterbindingobjlist.h" =20 typedef struct _virNWFilterObj virNWFilterObj; typedef virNWFilterObj *virNWFilterObjPtr; @@ -114,5 +113,3 @@ virNWFilterObjLock(virNWFilterObjPtr obj); =20 void virNWFilterObjUnlock(virNWFilterObjPtr obj); - -#endif /* LIBVIRT_VIRNWFILTEROBJ_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list