diff options
| author |   Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-04-01 02:22:54 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-04-01 02:22:54 -0800 |
| commit | a89ecb6a2ef732d04058d87801e2b6bd7e5c7089 (patch) | |
| tree | c84c5b3167c116f0c419a2bbb04877bdac38dd07 /include/linux/netfilter_ipv6 | |
| parent | [NETFILTER]: x_tables: unify IPv4/IPv6 esp match (diff) | |
| download | linux-dev-a89ecb6a2ef732d04058d87801e2b6bd7e5c7089.tar.xz linux-dev-a89ecb6a2ef732d04058d87801e2b6bd7e5c7089.zip | |
[NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
This unifies ipt_multiport and ip6t_multiport to xt_multiport.
As a result, this addes support for inversion and port range match
to IPv6 packets.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netfilter_ipv6')
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6t_multiport.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/include/linux/netfilter_ipv6/ip6t_multiport.h b/include/linux/netfilter_ipv6/ip6t_multiport.h index efe4954a8681..042c92661cee 100644 --- a/include/linux/netfilter_ipv6/ip6t_multiport.h +++ b/include/linux/netfilter_ipv6/ip6t_multiport.h @@ -1,21 +1,14 @@ #ifndef _IP6T_MULTIPORT_H #define _IP6T_MULTIPORT_H -#include <linux/netfilter_ipv6/ip6_tables.h> -enum ip6t_multiport_flags -{ - IP6T_MULTIPORT_SOURCE, - IP6T_MULTIPORT_DESTINATION, - IP6T_MULTIPORT_EITHER -}; +#include <linux/netfilter/xt_multiport.h> -#define IP6T_MULTI_PORTS 15 +#define IP6T_MULTIPORT_SOURCE XT_MULTIPORT_SOURCE +#define IP6T_MULTIPORT_DESTINATION XT_MULTIPORT_DESTINATION +#define IP6T_MULTIPORT_EITHER XT_MULTIPORT_EITHER -/* Must fit inside union ip6t_matchinfo: 16 bytes */ -struct ip6t_multiport -{ - u_int8_t flags; /* Type of comparison */ - u_int8_t count; /* Number of ports */ - u_int16_t ports[IP6T_MULTI_PORTS]; /* Ports */ -}; -#endif /*_IPT_MULTIPORT_H*/ +#define IP6T_MULTI_PORTS XT_MULTI_PORTS + +#define ip6t_multiport xt_multiport + +#endif /*_IP6T_MULTIPORT_H*/ |