diff options
Diffstat (limited to 'include/netlink/netfilter/exp.h')
| -rw-r--r-- | include/netlink/netfilter/exp.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/include/netlink/netfilter/exp.h b/include/netlink/netfilter/exp.h index 89a9d01..8b50c30 100644 --- a/include/netlink/netfilter/exp.h +++ b/include/netlink/netfilter/exp.h @@ -9,6 +9,7 @@ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch> * Copyright (c) 2007 Philip Craig <philipc@snapgear.com> * Copyright (c) 2007 Secure Computing Corporation + * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com> */ #ifndef NETLINK_EXP_H_ @@ -21,17 +22,6 @@ #include <linux/version.h> -#if CTA_EXPECT_MAX > CTA_EXPECT_HELP_NAME -#define NLE_ZONE -#elseif CTA_EXPECT_MAX > CTA_EXPECT_ZONE -#define NLE_ZONE -#define NLE_FLAGS -#elseif (CTA_EXPECT_MAX > CTA_EXPECT_FLAGS) -#define NLE_ZONE -#define NLE_FLAGS -#define NLE_NAT_FN_CLASS -#endif - #ifdef __cplusplus extern "C" { #endif @@ -42,9 +32,7 @@ enum nfnl_exp_tuples { NFNL_EXP_TUPLE_EXPECT, NFNL_EXP_TUPLE_MASTER, NFNL_EXP_TUPLE_MASK, -#ifdef NLE_NAT_FN_CLASS NFNL_EXP_TUPLE_NAT, -#endif NFNL_EXP_TUPLE_MAX }; @@ -88,19 +76,14 @@ extern int nfnl_exp_set_helper_name(struct nfnl_exp *, void *); extern int nfnl_exp_test_helper_name(const struct nfnl_exp *); extern const char * nfnl_exp_get_helper_name(const struct nfnl_exp *); -#ifdef NLE_ZONE extern void nfnl_exp_set_zone(struct nfnl_exp *, uint16_t); extern int nfnl_exp_test_zone(const struct nfnl_exp *); extern uint16_t nfnl_exp_get_zone(const struct nfnl_exp *); -#endif -#ifdef NLE_FLAGS extern void nfnl_exp_set_flags(struct nfnl_exp *, uint32_t); extern int nfnl_exp_test_flags(const struct nfnl_exp *); extern uint32_t nfnl_exp_get_flags(const struct nfnl_exp *); -#endif -#ifdef NLE_NAT_FN_CLASS extern void nfnl_exp_set_class(struct nfnl_exp *, uint32_t); extern int nfnl_exp_test_class(const struct nfnl_exp *); extern uint32_t nfnl_exp_get_class(const struct nfnl_exp *); @@ -112,7 +95,6 @@ extern const char * nfnl_exp_get_fn(const struct nfnl_exp *); extern void nfnl_exp_set_nat_dir(struct nfnl_exp *, uint8_t); extern int nfnl_exp_test_nat_dir(const struct nfnl_exp *); extern uint8_t nfnl_exp_get_nat_dir(const struct nfnl_exp *); -#endif // The int argument specifies which nfnl_exp_dir (expect, master, mask or nat) // Expectation objects only use orig, not reply |