mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
filter new files through cppi, so syntax-check passes once again
* src/conf/nwfilter_conf.h: Indent cpp directives. * src/conf/nwfilter_params.h: Likewise. * src/datatypes.h: Likewise. * src/nwfilter/nwfilter_driver.h: Likewise. * src/nwfilter/nwfilter_ebiptables_driver.h: Likewise. * src/nwfilter/nwfilter_gentech_driver.h: Likewise.
This commit is contained in:
parent
447c586a0d
commit
19a863c435
@ -24,15 +24,15 @@
|
|||||||
* Author: Stefan Berger <stefanb@us.ibm.com>
|
* Author: Stefan Berger <stefanb@us.ibm.com>
|
||||||
*/
|
*/
|
||||||
#ifndef NWFILTER_CONF_H
|
#ifndef NWFILTER_CONF_H
|
||||||
#define NWFILTER_CONF_H
|
# define NWFILTER_CONF_H
|
||||||
|
|
||||||
#include <stdint.h>
|
# include <stdint.h>
|
||||||
#include <stddef.h>
|
# include <stddef.h>
|
||||||
|
|
||||||
#include "internal.h"
|
# include "internal.h"
|
||||||
#include "util.h"
|
# include "util.h"
|
||||||
#include "hash.h"
|
# include "hash.h"
|
||||||
#include "xml.h"
|
# include "xml.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Chain suffix size is:
|
* Chain suffix size is:
|
||||||
@ -43,7 +43,7 @@
|
|||||||
* terminating '0' =
|
* terminating '0' =
|
||||||
* 32-3-15-1-1 = 12
|
* 32-3-15-1-1 = 12
|
||||||
*/
|
*/
|
||||||
#define MAX_CHAIN_SUFFIX_SIZE 12
|
# define MAX_CHAIN_SUFFIX_SIZE 12
|
||||||
|
|
||||||
|
|
||||||
enum virNWFilterEntryItemFlags {
|
enum virNWFilterEntryItemFlags {
|
||||||
@ -53,10 +53,10 @@ enum virNWFilterEntryItemFlags {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define HAS_ENTRY_ITEM(data) \
|
# define HAS_ENTRY_ITEM(data) \
|
||||||
(((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)
|
(((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)
|
||||||
|
|
||||||
#define ENTRY_GET_NEG_SIGN(data) \
|
# define ENTRY_GET_NEG_SIGN(data) \
|
||||||
((((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_IS_NEG) ? "!" : "")
|
((((data)->flags) & NWFILTER_ENTRY_ITEM_FLAG_IS_NEG) ? "!" : "")
|
||||||
|
|
||||||
// datatypes appearing in rule attributes
|
// datatypes appearing in rule attributes
|
||||||
@ -288,7 +288,7 @@ enum virNWFilterEbtablesTableType {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define MAX_RULE_PRIORITY 1000
|
# define MAX_RULE_PRIORITY 1000
|
||||||
|
|
||||||
|
|
||||||
typedef struct _virNWFilterRuleDef virNWFilterRuleDef;
|
typedef struct _virNWFilterRuleDef virNWFilterRuleDef;
|
||||||
@ -522,7 +522,7 @@ void virNWFilterConfLayerShutdown(void);
|
|||||||
int virNWFilterParamConfLayerInit(void);
|
int virNWFilterParamConfLayerInit(void);
|
||||||
void virNWFilterParamConfLayerShutdown(void);
|
void virNWFilterParamConfLayerShutdown(void);
|
||||||
|
|
||||||
#define virNWFilterReportError(conn, code, fmt...) \
|
# define virNWFilterReportError(conn, code, fmt...) \
|
||||||
virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__, \
|
virReportErrorHelper(conn, VIR_FROM_NWFILTER, code, __FILE__, \
|
||||||
__FUNCTION__, __LINE__, fmt)
|
__FUNCTION__, __LINE__, fmt)
|
||||||
|
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
* Author: Stefan Berger <stefanb@us.ibm.com>
|
* Author: Stefan Berger <stefanb@us.ibm.com>
|
||||||
*/
|
*/
|
||||||
#ifndef NWFILTER_PARAMS_H
|
#ifndef NWFILTER_PARAMS_H
|
||||||
#define NWFILTER_PARAMS_H
|
# define NWFILTER_PARAMS_H
|
||||||
|
|
||||||
#include "hash.h"
|
# include "hash.h"
|
||||||
|
|
||||||
typedef struct _virNWFilterHashTable virNWFilterHashTable;
|
typedef struct _virNWFilterHashTable virNWFilterHashTable;
|
||||||
typedef virNWFilterHashTable *virNWFilterHashTablePtr;
|
typedef virNWFilterHashTable *virNWFilterHashTablePtr;
|
||||||
|
@ -126,9 +126,9 @@
|
|||||||
* magic value used to protect the API when pointers to network filter
|
* magic value used to protect the API when pointers to network filter
|
||||||
* pool structures are passed down by the users.
|
* pool structures are passed down by the users.
|
||||||
*/
|
*/
|
||||||
#define VIR_NWFILTER_MAGIC 0xDEAD7777
|
# define VIR_NWFILTER_MAGIC 0xDEAD7777
|
||||||
#define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC)
|
# define VIR_IS_NWFILTER(obj) ((obj) && (obj)->magic==VIR_NWFILTER_MAGIC)
|
||||||
#define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn))
|
# define VIR_IS_CONNECTED_NWFILTER(obj) (VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn))
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -26,10 +26,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __VIR_NWFILTER_DRIVER_H__
|
#ifndef __VIR_NWFILTER_DRIVER_H__
|
||||||
#define __VIR_NWFILTER_DRIVER_H__
|
# define __VIR_NWFILTER_DRIVER_H__
|
||||||
|
|
||||||
#include "nwfilter_params.h"
|
# include "nwfilter_params.h"
|
||||||
#include "nwfilter_conf.h"
|
# include "nwfilter_conf.h"
|
||||||
|
|
||||||
int nwfilterRegister(void);
|
int nwfilterRegister(void);
|
||||||
|
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
* Author: Stefan Berger <stefanb@us.ibm.com>
|
* Author: Stefan Berger <stefanb@us.ibm.com>
|
||||||
*/
|
*/
|
||||||
#ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__
|
#ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__
|
||||||
#define VIR_NWFILTER_EBTABLES_DRIVER_H__
|
# define VIR_NWFILTER_EBTABLES_DRIVER_H__
|
||||||
|
|
||||||
#define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
|
# define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
|
||||||
|
|
||||||
enum RuleType {
|
enum RuleType {
|
||||||
RT_EBTABLES,
|
RT_EBTABLES,
|
||||||
@ -43,6 +43,6 @@ struct _ebiptablesRuleInst {
|
|||||||
|
|
||||||
extern virNWFilterTechDriver ebiptables_driver;
|
extern virNWFilterTechDriver ebiptables_driver;
|
||||||
|
|
||||||
#define EBIPTABLES_DRIVER_ID "ebiptables"
|
# define EBIPTABLES_DRIVER_ID "ebiptables"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
* Author: Stefan Berger <stefanb@us.ibm.com>
|
* Author: Stefan Berger <stefanb@us.ibm.com>
|
||||||
*/
|
*/
|
||||||
#ifndef __NWFILTER_GENTECH_DRIVER_H
|
#ifndef __NWFILTER_GENTECH_DRIVER_H
|
||||||
#define __NWFILTER_GENTECH_DRIVER_H
|
# define __NWFILTER_GENTECH_DRIVER_H
|
||||||
|
|
||||||
virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);
|
virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user