[NETFILTER]: xt_conntrack: add port and direction matching
Extend the xt_conntrack match revision 1 by port matching (all four
{orig,repl}{src,dst}) and by packet direction matching.
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
41d0cdedd5
commit
b41649989c
@@ -6,9 +6,6 @@
|
||||
#define _XT_CONNTRACK_H
|
||||
|
||||
#include <linux/netfilter/nf_conntrack_tuple_common.h>
|
||||
#ifdef __KERNEL__
|
||||
# include <linux/in.h>
|
||||
#endif
|
||||
|
||||
#define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
|
||||
#define XT_CONNTRACK_STATE_INVALID (1 << 0)
|
||||
@@ -18,14 +15,21 @@
|
||||
#define XT_CONNTRACK_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 3))
|
||||
|
||||
/* flags, invflags: */
|
||||
#define XT_CONNTRACK_STATE 0x01
|
||||
#define XT_CONNTRACK_PROTO 0x02
|
||||
#define XT_CONNTRACK_ORIGSRC 0x04
|
||||
#define XT_CONNTRACK_ORIGDST 0x08
|
||||
#define XT_CONNTRACK_REPLSRC 0x10
|
||||
#define XT_CONNTRACK_REPLDST 0x20
|
||||
#define XT_CONNTRACK_STATUS 0x40
|
||||
#define XT_CONNTRACK_EXPIRES 0x80
|
||||
enum {
|
||||
XT_CONNTRACK_STATE = 1 << 0,
|
||||
XT_CONNTRACK_PROTO = 1 << 1,
|
||||
XT_CONNTRACK_ORIGSRC = 1 << 2,
|
||||
XT_CONNTRACK_ORIGDST = 1 << 3,
|
||||
XT_CONNTRACK_REPLSRC = 1 << 4,
|
||||
XT_CONNTRACK_REPLDST = 1 << 5,
|
||||
XT_CONNTRACK_STATUS = 1 << 6,
|
||||
XT_CONNTRACK_EXPIRES = 1 << 7,
|
||||
XT_CONNTRACK_ORIGSRC_PORT = 1 << 8,
|
||||
XT_CONNTRACK_ORIGDST_PORT = 1 << 9,
|
||||
XT_CONNTRACK_REPLSRC_PORT = 1 << 10,
|
||||
XT_CONNTRACK_REPLDST_PORT = 1 << 11,
|
||||
XT_CONNTRACK_DIRECTION = 1 << 12,
|
||||
};
|
||||
|
||||
/* This is exposed to userspace, so remains frozen in time. */
|
||||
struct ip_conntrack_old_tuple
|
||||
@@ -70,8 +74,10 @@ struct xt_conntrack_mtinfo1 {
|
||||
union nf_inet_addr repldst_addr, repldst_mask;
|
||||
u_int32_t expires_min, expires_max;
|
||||
u_int16_t l4proto;
|
||||
__be16 origsrc_port, origdst_port;
|
||||
__be16 replsrc_port, repldst_port;
|
||||
u_int16_t match_flags, invert_flags;
|
||||
u_int8_t state_mask, status_mask;
|
||||
u_int8_t match_flags, invert_flags;
|
||||
};
|
||||
|
||||
#endif /*_XT_CONNTRACK_H*/
|
||||
|
||||
Reference in New Issue
Block a user