[NETFILTER]: x_tables: unify IPv4/IPv6 multiport match

[~andy/linux] / include / linux / netfilter_ipv4 / ipt_multiport.h

diff --git a/include/linux/netfilter_ipv4/ipt_multiport.h b/include/linux/netfilter_ipv4/ipt_multiport.h
index e6b6fff811dfb5d3ba5df901029f7b289cd9b1af..55fe85eca88c18b352e694a427290b1b593ec9c4 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_multiport.h
+++ b/include/linux/netfilter_ipv4/ipt_multiport.h
@@ -1,30 +1,15 @@
 #ifndef _IPT_MULTIPORT_H
 #define _IPT_MULTIPORT_H
-#include <linux/netfilter_ipv4/ip_tables.h>
 
-enum ipt_multiport_flags
-{
-       IPT_MULTIPORT_SOURCE,
-       IPT_MULTIPORT_DESTINATION,
-       IPT_MULTIPORT_EITHER
-};
+#include <linux/netfilter/xt_multiport.h>
 
-#define IPT_MULTI_PORTS        15
+#define IPT_MULTIPORT_SOURCE           XT_MULTIPORT_SOURCE
+#define IPT_MULTIPORT_DESTINATION      XT_MULTIPORT_DESTINATION
+#define IPT_MULTIPORT_EITHER           XT_MULTIPORT_EITHER
 
-/* Must fit inside union ipt_matchinfo: 16 bytes */
-struct ipt_multiport
-{
-       u_int8_t flags;                         /* Type of comparison */
-       u_int8_t count;                         /* Number of ports */
-       u_int16_t ports[IPT_MULTI_PORTS];       /* Ports */
-};
+#define IPT_MULTI_PORTS                        XT_MULTI_PORTS
+
+#define ipt_multiport                  xt_multiport
+#define ipt_multiport_v1               xt_multiport_v1
 
-struct ipt_multiport_v1
-{
-       u_int8_t flags;                         /* Type of comparison */
-       u_int8_t count;                         /* Number of ports */
-       u_int16_t ports[IPT_MULTI_PORTS];       /* Ports */
-       u_int8_t pflags[IPT_MULTI_PORTS];       /* Port flags */
-       u_int8_t invert;                        /* Invert flag */
-};
 #endif /*_IPT_MULTIPORT_H*/