diff options
| author | Ken-ichirou MATSUZAWA <chamaken@gmail.com> | 2015-09-11 12:12:11 +0900 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-12 17:17:34 +0200 |
| commit | 721ea5ec049e12afdd7c182f2899ab6d92914e68 (patch) | |
| tree | 330d9581aeb3a7949da14594dd093f70e4a4f052 /include/libnetfilter_log | |
| parent | 6b2f3c08adc2c84c0b5f969af6cfb4d44940e560 (diff) | |
include: Sync with kernel headers
Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/libnetfilter_log')
| -rw-r--r-- | include/libnetfilter_log/linux_nfnetlink_log.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h index 9f38277..081e7f9 100644 --- a/include/libnetfilter_log/linux_nfnetlink_log.h +++ b/include/libnetfilter_log/linux_nfnetlink_log.h @@ -1,16 +1,12 @@ #ifndef _NFNETLINK_LOG_H #define _NFNETLINK_LOG_H -#ifndef aligned_u64 -#define aligned_u64 unsigned long long __attribute__((aligned(8))) -#endif - /* This file describes the netlink messages (i.e. 'protocol packets'), * and not any kind of function definitions. It is shared between kernel and * userspace. Don't put kernel specific stuff in here */ #include <linux/types.h> -#include <libnfnetlink/linux_nfnetlink.h> +#include <linux/netfilter/nfnetlink.h> enum nfulnl_msg_types { NFULNL_MSG_PACKET, /* packet from kernel to userspace */ @@ -55,6 +51,8 @@ enum nfulnl_attr_type { NFULA_HWTYPE, /* hardware type */ NFULA_HWHEADER, /* hardware header */ NFULA_HWLEN, /* hardware header length */ + NFULA_CT, /* nf_conntrack_netlink.h */ + NFULA_CT_INFO, /* enum ip_conntrack_info */ __NFULA_MAX }; @@ -97,5 +95,6 @@ enum nfulnl_attr_config { #define NFULNL_CFG_F_SEQ 0x0001 #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002 +#define NFULNL_CFG_F_CONNTRACK 0x0004 #endif /* _NFNETLINK_LOG_H */ |