diff options
author | Brett Mastbergen <bmastbergen@untangle.com> | 2019-07-18 15:28:09 -0400 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-11-12 18:21:55 +0100 |
commit | e800ecfa3dd91bf789dc28f1c3f8f485c619c01c (patch) | |
tree | 9f4c6603b3d0124d674b45d7fc5be559ec4c2236 /package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch | |
parent | 3c0357e7b4229e8855d6f1a98db6d840bb9e0e86 (diff) | |
download | upstream-e800ecfa3dd91bf789dc28f1c3f8f485c619c01c.tar.gz upstream-e800ecfa3dd91bf789dc28f1c3f8f485c619c01c.tar.bz2 upstream-e800ecfa3dd91bf789dc28f1c3f8f485c619c01c.zip |
libnetfilter-log: Backport kernel header syncs
Backport upstream commits that sync the local kernel header
copies in this library, with up to date copies. These updated
headers ensure that libnetfilter-log users can use current
kernel functionality such as requesting that conntrack
information be appended to nflog events sent to userspace via
the NFULNL_CFG_F_CONNTRACK flag. This functionality has been
available since kernel version 4.4
Signed-off-by: Brett Mastbergen <bmastbergen@untangle.com>
Diffstat (limited to 'package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch')
-rw-r--r-- | package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch b/package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch new file mode 100644 index 0000000000..60973a276a --- /dev/null +++ b/package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch @@ -0,0 +1,52 @@ +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(-) + +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 */ +-- +2.11.0 + |