diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 14:44:29 +0000 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 14:44:29 +0000 |
| commit | 2a53b5dfee3c80b4c4940ad4c73c82248b4571bb (patch) | |
| tree | 73a4fe81edc619a6180ee8d1a02ef5b1942ba910 /include | |
| parent | 1e0476f8157fc09c6f9ff086e7b55452b39ea48d (diff) | |
| parent | e61ac9a2e58cdcf6dc9a12d32b1f221e078e5d05 (diff) | |
| download | conntrack-tools-2a53b5dfee3c80b4c4940ad4c73c82248b4571bb.tar.gz conntrack-tools-2a53b5dfee3c80b4c4940ad4c73c82248b4571bb.zip | |
Merge tag 'conntrack-tools-1.4.0' into lithium
conntrack-tools 1.4.0 release
Diffstat (limited to 'include')
| -rw-r--r-- | include/helper.h | 9 | ||||
| -rw-r--r-- | include/linux/netfilter/nfnetlink_queue.h | 11 |
2 files changed, 14 insertions, 6 deletions
diff --git a/include/helper.h b/include/helper.h index 02ff3df..9d96fb7 100644 --- a/include/helper.h +++ b/include/helper.h @@ -35,6 +35,7 @@ struct ctd_helper { struct ctd_helper_instance { struct list_head head; uint32_t queue_num; + uint32_t queue_len; uint16_t l3proto; uint8_t l4proto; struct ctd_helper *helper; @@ -99,6 +100,12 @@ enum ip_conntrack_info { #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL) -#define pr_debug printf +#if 0 +#define pr_debug(fmt, arg...) \ + printf(fmt, ##arg) +#else +#define pr_debug(fmt, arg...) \ + ({ if (0) printf(fmt, ##arg); 0; }) +#endif #endif diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h index da44b33..e0d8fd8 100644 --- a/include/linux/netfilter/nfnetlink_queue.h +++ b/include/linux/netfilter/nfnetlink_queue.h @@ -80,19 +80,20 @@ struct nfqnl_msg_config_params { __u8 copy_mode; /* enum nfqnl_config_mode */ } __attribute__ ((packed)); -enum nfqnl_flags { - NFQNL_F_NONE = 0, - NFQNL_F_CONNTRACK = (1 << 0), -}; enum nfqnl_attr_config { NFQA_CFG_UNSPEC, NFQA_CFG_CMD, /* nfqnl_msg_config_cmd */ NFQA_CFG_PARAMS, /* nfqnl_msg_config_params */ NFQA_CFG_QUEUE_MAXLEN, /* __u32 */ - NFQA_CFG_FLAGS, /* __u32 */ + NFQA_CFG_MASK, /* identify which flags to change */ + NFQA_CFG_FLAGS, /* value of these flags (__u32) */ __NFQA_CFG_MAX }; #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1) +/* Flags for NFQA_CFG_FLAGS */ +#define NFQA_CFG_F_FAIL_OPEN (1 << 0) +#define NFQA_CFG_F_CONNTRACK (1 << 1) + #endif /* _NFNETLINK_QUEUE_H */ |