summaryrefslogtreecommitdiffstats
path: root/include/libipset
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2015-06-25 10:24:18 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2015-06-25 10:24:18 +0200
commit842f197be24dc1cdff8a95f78c4a0a50825c23bb (patch)
tree35ec64ea6a6dbe984b09c289d45e13307defc47d /include/libipset
parent2be57618628c15335df07e53e6045b81ef91205b (diff)
Update userspace header file from the kernel tree
Diffstat (limited to 'include/libipset')
-rw-r--r--include/libipset/linux_ip_set.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h
index ae4127d..63b2e34 100644
--- a/include/libipset/linux_ip_set.h
+++ b/include/libipset/linux_ip_set.h
@@ -10,7 +10,6 @@
#ifndef _UAPI_IP_SET_H
#define _UAPI_IP_SET_H
-
#include <linux/types.h>
/* The protocol version */
@@ -19,7 +18,7 @@
/* The max length of strings including NUL: set and type identifiers */
#define IPSET_MAXNAMELEN 32
-/* The maximum permissible length we will accept over netlink (inc. comments) */
+/* The maximum permissible comment length we will accept over netlink */
#define IPSET_MAX_COMMENT_SIZE 255
/* Message types and commands */
@@ -257,11 +256,17 @@ enum {
IPSET_COUNTER_GT,
};
-struct ip_set_counter_match {
+/* Backward compatibility for set match v3 */
+struct ip_set_counter_match0 {
__u8 op;
__u64 value;
};
+struct ip_set_counter_match {
+ __aligned_u64 value;
+ __u8 op;
+};
+
/* Interface to iptables/ip6tables */
#define SO_IP_SET 83