ipt_ACCOUNT, iptables: (tomj) fix delete handling (#1379)
[ipt_ACCOUNT] / linux-2.6.16.patch
CommitLineData
3fb0d0cc
TJ
1diff -u -r linux-2.6.16.14/include/linux/netfilter/x_tables.h linux-2.6.16.14.ipt_ACCOUNT/include/linux/netfilter/x_tables.h
2--- linux-2.6.16.14/include/linux/netfilter/x_tables.h 2006-05-05 02:03:45.000000000 +0200
3+++ linux-2.6.16.14.ipt_ACCOUNT/include/linux/netfilter/x_tables.h 2006-05-06 13:45:18.000000000 +0200
4@@ -50,12 +50,23 @@
5 #define XT_SO_SET_ADD_COUNTERS (XT_BASE_CTL + 1)
6 #define XT_SO_SET_MAX XT_SO_SET_ADD_COUNTERS
7
8+#define XT_SO_SET_ACCOUNT_HANDLE_FREE (XT_BASE_CTL + 2)
9+#define XT_SO_SET_ACCOUNT_HANDLE_FREE_ALL (XT_BASE_CTL + 3)
10+#define XT_SO_SET_ACCOUNT_MAX XT_SO_SET_ACCOUNT_HANDLE_FREE_ALL
11+
12 #define XT_SO_GET_INFO (XT_BASE_CTL)
13 #define XT_SO_GET_ENTRIES (XT_BASE_CTL + 1)
14 #define XT_SO_GET_REVISION_MATCH (XT_BASE_CTL + 2)
15 #define XT_SO_GET_REVISION_TARGET (XT_BASE_CTL + 3)
16 #define XT_SO_GET_MAX XT_SO_GET_REVISION_TARGET
17
18+#define XT_SO_GET_ACCOUNT_PREPARE_READ (XT_BASE_CTL + 4)
19+#define XT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH (XT_BASE_CTL + 5)
20+#define XT_SO_GET_ACCOUNT_GET_DATA (XT_BASE_CTL + 6)
21+#define XT_SO_GET_ACCOUNT_GET_HANDLE_USAGE (XT_BASE_CTL + 7)
22+#define XT_SO_GET_ACCOUNT_GET_TABLE_NAMES (XT_BASE_CTL + 8)
23+#define XT_SO_GET_ACCOUNT_MAX XT_SO_GET_ACCOUNT_GET_TABLE_NAMES
24+
25 #define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
26 #define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
27
28diff -u -r linux-2.6.16.14/include/linux/netfilter_ipv4/ip_tables.h linux-2.6.16.14.ipt_ACCOUNT/include/linux/netfilter_ipv4/ip_tables.h
29--- linux-2.6.16.14/include/linux/netfilter_ipv4/ip_tables.h 2006-05-05 02:03:45.000000000 +0200
30+++ linux-2.6.16.14.ipt_ACCOUNT/include/linux/netfilter_ipv4/ip_tables.h 2006-05-06 13:44:43.181915139 +0200
31@@ -160,12 +160,23 @@
32 #define IPT_SO_SET_ADD_COUNTERS XT_SO_SET_ADD_COUNTERS
33 #define IPT_SO_SET_MAX XT_SO_SET_MAX
34
35+#define IPT_SO_SET_ACCOUNT_HANDLE_FREE XT_SO_SET_ACCOUNT_HANDLE_FREE
36+#define IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL XT_SO_SET_ACCOUNT_HANDLE_FREE_ALL
37+#define IPT_SO_SET_ACCOUNT_MAX XT_SO_SET_ACCOUNT_MAX
38+
39 #define IPT_SO_GET_INFO XT_SO_GET_INFO
40 #define IPT_SO_GET_ENTRIES XT_SO_GET_ENTRIES
41 #define IPT_SO_GET_REVISION_MATCH XT_SO_GET_REVISION_MATCH
42 #define IPT_SO_GET_REVISION_TARGET XT_SO_GET_REVISION_TARGET
43 #define IPT_SO_GET_MAX XT_SO_GET_REVISION_TARGET
44
45+#define IPT_SO_GET_ACCOUNT_PREPARE_READ XT_SO_GET_ACCOUNT_PREPARE_READ
46+#define IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH XT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH
47+#define IPT_SO_GET_ACCOUNT_GET_DATA XT_SO_GET_ACCOUNT_GET_DATA
48+#define IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE XT_SO_GET_ACCOUNT_GET_HANDLE_USAGE
49+#define IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES XT_SO_GET_ACCOUNT_GET_TABLE_NAMES
50+#define IPT_SO_GET_ACCOUNT_MAX XT_SO_GET_ACCOUNT_MAX
51+
52 #define IPT_CONTINUE XT_CONTINUE
53 #define IPT_RETURN XT_RETURN
54