|
|
- From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001
- From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
- Date: Fri, 11 Sep 2015 12:12:11 +0900
- Subject: 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>
- ---
- include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
- --- 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 */
|
