diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-12-18 03:10:56 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2011-12-18 03:10:57 +0100 |
commit | 32a4b7dcaf252348732362cd6d853bf0005b2bdd (patch) | |
tree | a0cb75f98e4a09b75a8d51095f4a39769d778c74 /include/linux/netfilter/nf_conntrack_common.h | |
parent | b8c42eca0f224a00bf55b60ded81af14a1e07da1 (diff) | |
parent | 79ddbf202a06e6f018e087a328c2ca91e65a8463 (diff) |
Merge branch 'stable'
Diffstat (limited to 'include/linux/netfilter/nf_conntrack_common.h')
-rw-r--r-- | include/linux/netfilter/nf_conntrack_common.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h index 34a7fc65..38aa52d7 100644 --- a/include/linux/netfilter/nf_conntrack_common.h +++ b/include/linux/netfilter/nf_conntrack_common.h @@ -18,6 +18,9 @@ enum ip_conntrack_info { /* >= this indicates reply direction */ IP_CT_IS_REPLY, + IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY, + IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY, + IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY, /* Number of distinct IP_CT types (no NEW in reply dirn). */ IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 }; @@ -76,6 +79,10 @@ enum ip_conntrack_status { /* Conntrack is a template */ IPS_TEMPLATE_BIT = 11, IPS_TEMPLATE = (1 << IPS_TEMPLATE_BIT), + + /* Conntrack is a fake untracked entry */ + IPS_UNTRACKED_BIT = 12, + IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT), }; /* Connection tracking event types */ @@ -94,6 +101,13 @@ enum ip_conntrack_events { enum ip_conntrack_expect_events { IPEXP_NEW, /* new expectation */ + IPEXP_DESTROY, /* destroyed expectation */ }; +/* expectation flags */ +#define NF_CT_EXPECT_PERMANENT 0x1 +#define NF_CT_EXPECT_INACTIVE 0x2 +#define NF_CT_EXPECT_USERSPACE 0x4 + + #endif /* _NF_CONNTRACK_COMMON_H */ |