aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-06-02 14:08:44 -0400
committerpablo <pablo@1984.(none)>2009-06-02 14:08:44 -0400
commit6bfea1984aea86089907caf8974513c2402a3b3d (patch)
tree82fb4746fe51489583408f05cd4d6a2da5f0ff0d /include
parent274d383b9c1906847a64bbb267b0183599ce86a0 (diff)
netfilter: conntrack: remove events flags from userspace exposed file
This patch moves the event flags from linux/netfilter/nf_conntrack_common.h to net/netfilter/nf_conntrack_ecache.h. This flags are not of any use from userspace. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/nf_conntrack_common.h69
-rw-r--r--include/net/netfilter/nf_conntrack_ecache.h69
2 files changed, 69 insertions, 69 deletions
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index 885cbe282260..a8248ee422b7 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -75,75 +75,6 @@ enum ip_conntrack_status {
75 IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT), 75 IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),
76}; 76};
77 77
78/* Connection tracking event bits */
79enum ip_conntrack_events
80{
81 /* New conntrack */
82 IPCT_NEW_BIT = 0,
83 IPCT_NEW = (1 << IPCT_NEW_BIT),
84
85 /* Expected connection */
86 IPCT_RELATED_BIT = 1,
87 IPCT_RELATED = (1 << IPCT_RELATED_BIT),
88
89 /* Destroyed conntrack */
90 IPCT_DESTROY_BIT = 2,
91 IPCT_DESTROY = (1 << IPCT_DESTROY_BIT),
92
93 /* Timer has been refreshed */
94 IPCT_REFRESH_BIT = 3,
95 IPCT_REFRESH = (1 << IPCT_REFRESH_BIT),
96
97 /* Status has changed */
98 IPCT_STATUS_BIT = 4,
99 IPCT_STATUS = (1 << IPCT_STATUS_BIT),
100
101 /* Update of protocol info */
102 IPCT_PROTOINFO_BIT = 5,
103 IPCT_PROTOINFO = (1 << IPCT_PROTOINFO_BIT),
104
105 /* Volatile protocol info */
106 IPCT_PROTOINFO_VOLATILE_BIT = 6,
107 IPCT_PROTOINFO_VOLATILE = (1 << IPCT_PROTOINFO_VOLATILE_BIT),
108
109 /* New helper for conntrack */
110 IPCT_HELPER_BIT = 7,
111 IPCT_HELPER = (1 << IPCT_HELPER_BIT),
112
113 /* Update of helper info */
114 IPCT_HELPINFO_BIT = 8,
115 IPCT_HELPINFO = (1 << IPCT_HELPINFO_BIT),
116
117 /* Volatile helper info */
118 IPCT_HELPINFO_VOLATILE_BIT = 9,
119 IPCT_HELPINFO_VOLATILE = (1 << IPCT_HELPINFO_VOLATILE_BIT),
120
121 /* NAT info */
122 IPCT_NATINFO_BIT = 10,
123 IPCT_NATINFO = (1 << IPCT_NATINFO_BIT),
124
125 /* Counter highest bit has been set, unused */
126 IPCT_COUNTER_FILLING_BIT = 11,
127 IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),
128
129 /* Mark is set */
130 IPCT_MARK_BIT = 12,
131 IPCT_MARK = (1 << IPCT_MARK_BIT),
132
133 /* NAT sequence adjustment */
134 IPCT_NATSEQADJ_BIT = 13,
135 IPCT_NATSEQADJ = (1 << IPCT_NATSEQADJ_BIT),
136
137 /* Secmark is set */
138 IPCT_SECMARK_BIT = 14,
139 IPCT_SECMARK = (1 << IPCT_SECMARK_BIT),
140};
141
142enum ip_conntrack_expect_events {
143 IPEXP_NEW_BIT = 0,
144 IPEXP_NEW = (1 << IPEXP_NEW_BIT),
145};
146
147#ifdef __KERNEL__ 78#ifdef __KERNEL__
148struct ip_conntrack_stat 79struct ip_conntrack_stat
149{ 80{
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 0ff0dc69ca4a..892b8cdf7f62 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -11,6 +11,75 @@
11#include <net/net_namespace.h> 11#include <net/net_namespace.h>
12#include <net/netfilter/nf_conntrack_expect.h> 12#include <net/netfilter/nf_conntrack_expect.h>
13 13
14/* Connection tracking event bits */
15enum ip_conntrack_events
16{
17 /* New conntrack */
18 IPCT_NEW_BIT = 0,
19 IPCT_NEW = (1 << IPCT_NEW_BIT),
20
21 /* Expected connection */
22 IPCT_RELATED_BIT = 1,
23 IPCT_RELATED = (1 << IPCT_RELATED_BIT),
24
25 /* Destroyed conntrack */
26 IPCT_DESTROY_BIT = 2,
27 IPCT_DESTROY = (1 << IPCT_DESTROY_BIT),
28
29 /* Timer has been refreshed */
30 IPCT_REFRESH_BIT = 3,
31 IPCT_REFRESH = (1 << IPCT_REFRESH_BIT),
32
33 /* Status has changed */
34 IPCT_STATUS_BIT = 4,
35 IPCT_STATUS = (1 << IPCT_STATUS_BIT),
36
37 /* Update of protocol info */
38 IPCT_PROTOINFO_BIT = 5,
39 IPCT_PROTOINFO = (1 << IPCT_PROTOINFO_BIT),
40
41 /* Volatile protocol info */
42 IPCT_PROTOINFO_VOLATILE_BIT = 6,
43 IPCT_PROTOINFO_VOLATILE = (1 << IPCT_PROTOINFO_VOLATILE_BIT),
44
45 /* New helper for conntrack */
46 IPCT_HELPER_BIT = 7,
47 IPCT_HELPER = (1 << IPCT_HELPER_BIT),
48
49 /* Update of helper info */
50 IPCT_HELPINFO_BIT = 8,
51 IPCT_HELPINFO = (1 << IPCT_HELPINFO_BIT),
52
53 /* Volatile helper info */
54 IPCT_HELPINFO_VOLATILE_BIT = 9,
55 IPCT_HELPINFO_VOLATILE = (1 << IPCT_HELPINFO_VOLATILE_BIT),
56
57 /* NAT info */
58 IPCT_NATINFO_BIT = 10,
59 IPCT_NATINFO = (1 << IPCT_NATINFO_BIT),
60
61 /* Counter highest bit has been set, unused */
62 IPCT_COUNTER_FILLING_BIT = 11,
63 IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),
64
65 /* Mark is set */
66 IPCT_MARK_BIT = 12,
67 IPCT_MARK = (1 << IPCT_MARK_BIT),
68
69 /* NAT sequence adjustment */
70 IPCT_NATSEQADJ_BIT = 13,
71 IPCT_NATSEQADJ = (1 << IPCT_NATSEQADJ_BIT),
72
73 /* Secmark is set */
74 IPCT_SECMARK_BIT = 14,
75 IPCT_SECMARK = (1 << IPCT_SECMARK_BIT),
76};
77
78enum ip_conntrack_expect_events {
79 IPEXP_NEW_BIT = 0,
80 IPEXP_NEW = (1 << IPEXP_NEW_BIT),
81};
82
14#ifdef CONFIG_NF_CONNTRACK_EVENTS 83#ifdef CONFIG_NF_CONNTRACK_EVENTS
15struct nf_conntrack_ecache { 84struct nf_conntrack_ecache {
16 struct nf_conn *ct; 85 struct nf_conn *ct;