95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
From 5f6a7f009687f9790411e8e94b41423dcbe205b1 Mon Sep 17 00:00:00 2001
|
|
From: Florian Westphal <fw@strlen.de>
|
|
Date: Mon, 2 Aug 2021 11:12:28 +0200
|
|
Subject: include: sync uapi header with nf-next
|
|
|
|
Conflict: remove CTA_STATUS_MASK enum constant not provided by kernel.
|
|
Reference: https://git.netfilter.org/libnetfilter_conntrack/commit/?id=5f6a7f009687f9790411e8e94b41423dcbe205b1
|
|
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
---
|
|
.../linux_nfnetlink_conntrack.h | 23 +++++++++++++++----
|
|
1 file changed, 18 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
|
|
index aa45723..693f3d8 100644
|
|
--- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
|
|
+++ b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
|
|
@@ -58,6 +58,7 @@ enum ctattr_type {
|
|
CTA_LABELS,
|
|
CTA_LABELS_MASK,
|
|
CTA_SYNPROXY,
|
|
+ CTA_FILTER,
|
|
__CTA_MAX
|
|
};
|
|
#define CTA_MAX (__CTA_MAX - 1)
|
|
@@ -121,6 +122,7 @@ enum ctattr_protoinfo_dccp {
|
|
CTA_PROTOINFO_DCCP_STATE,
|
|
CTA_PROTOINFO_DCCP_ROLE,
|
|
CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
|
|
+ CTA_PROTOINFO_DCCP_PAD,
|
|
__CTA_PROTOINFO_DCCP_MAX,
|
|
};
|
|
#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
|
|
@@ -140,6 +142,7 @@ enum ctattr_counters {
|
|
CTA_COUNTERS_BYTES, /* 64bit counters */
|
|
CTA_COUNTERS32_PACKETS, /* old 32bit counters, unused */
|
|
CTA_COUNTERS32_BYTES, /* old 32bit counters, unused */
|
|
+ CTA_COUNTERS_PAD,
|
|
__CTA_COUNTERS_MAX
|
|
};
|
|
#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
|
|
@@ -148,6 +151,7 @@ enum ctattr_tstamp {
|
|
CTA_TIMESTAMP_UNSPEC,
|
|
CTA_TIMESTAMP_START,
|
|
CTA_TIMESTAMP_STOP,
|
|
+ CTA_TIMESTAMP_PAD,
|
|
__CTA_TIMESTAMP_MAX
|
|
};
|
|
#define CTA_TIMESTAMP_MAX (__CTA_TIMESTAMP_MAX - 1)
|
|
@@ -242,13 +246,13 @@ enum ctattr_secctx {
|
|
|
|
enum ctattr_stats_cpu {
|
|
CTA_STATS_UNSPEC,
|
|
- CTA_STATS_SEARCHED,
|
|
+ CTA_STATS_SEARCHED, /* no longer used */
|
|
CTA_STATS_FOUND,
|
|
- CTA_STATS_NEW,
|
|
+ CTA_STATS_NEW, /* no longer used */
|
|
CTA_STATS_INVALID,
|
|
- CTA_STATS_IGNORE,
|
|
- CTA_STATS_DELETE,
|
|
- CTA_STATS_DELETE_LIST,
|
|
+ CTA_STATS_IGNORE, /* no longer used */
|
|
+ CTA_STATS_DELETE, /* no longer used */
|
|
+ CTA_STATS_DELETE_LIST, /* no longer used */
|
|
CTA_STATS_INSERT,
|
|
CTA_STATS_INSERT_FAILED,
|
|
CTA_STATS_DROP,
|
|
@@ -262,6 +266,7 @@ enum ctattr_stats_cpu {
|
|
enum ctattr_stats_global {
|
|
CTA_STATS_GLOBAL_UNSPEC,
|
|
CTA_STATS_GLOBAL_ENTRIES,
|
|
+ CTA_STATS_GLOBAL_MAX_ENTRIES,
|
|
__CTA_STATS_GLOBAL_MAX,
|
|
};
|
|
#define CTA_STATS_GLOBAL_MAX (__CTA_STATS_GLOBAL_MAX - 1)
|
|
@@ -275,6 +280,14 @@ enum ctattr_expect_stats {
|
|
};
|
|
#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
|
|
|
|
+enum ctattr_filter {
|
|
+ CTA_FILTER_UNSPEC,
|
|
+ CTA_FILTER_ORIG_FLAGS,
|
|
+ CTA_FILTER_REPLY_FLAGS,
|
|
+ __CTA_FILTER_MAX
|
|
+};
|
|
+#define CTA_FILTER_MAX (__CTA_FILTER_MAX - 1)
|
|
+
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
--
|
|
2.33.0
|
|
|