The branch, master has been updated
via 41fb32ab48248f206e11e1bde8d2298cf4824829 (commit)
from 1a4481da060860e4781aa70f43bdd3620a92917b (commit)
- Log -----------------------------------------------------------------
commit 41fb32ab48248f206e11e1bde8d2298cf4824829
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Wed Apr 8 16:57:04 2009 +0200
Support for 2.6.28 and 2.6.29
-----------------------------------------------------------------------
Summary of changes:
linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
index 6d3f562..671c1c4 100644
--- a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
+++ b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c
@@ -206,6 +206,9 @@ static int ipt_acc_table_insert(char *name, u_int32_t ip,
u_int32_t netmask)
return -1;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+static bool ipt_acc_checkentry(const struct xt_tgchk_param *par)
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
static bool ipt_acc_checkentry(const char *tablename,
#else
@@ -224,8 +227,13 @@ static int ipt_acc_checkentry(const char *tablename,
unsigned int targinfosize,
#endif
unsigned int hook_mask)
+#endif /* >= 2.6.28 */
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+ struct ipt_acc_info *info = par->targinfo;
+#else
struct ipt_acc_info *info = targinfo;
+#endif
int table_nr;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
@@ -260,6 +268,9 @@ static int ipt_acc_checkentry(const char *tablename,
#endif
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+static void ipt_acc_destroy(const struct xt_tgdtor_param *par)
+#else
static void ipt_acc_destroy(
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
const struct xt_target *target,
@@ -270,9 +281,14 @@ static void ipt_acc_destroy(
void *targinfo,
unsigned int targinfosize)
#endif
+#endif /* >= 2.6.28 */
{
unsigned int i;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+ struct ipt_acc_info *info = par->targinfo;
+#else
struct ipt_acc_info *info = targinfo;
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) {
@@ -467,6 +483,9 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8
*mask_8,
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+static unsigned int ipt_acc_target(struct sk_buff *skb, const struct
xt_target_param *par)
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
static unsigned int ipt_acc_target(struct sk_buff *skb,
#else
@@ -484,9 +503,15 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb,
const void *targinfo,
void *userinfo)
#endif
+#endif /* 2.6.28 */
{
- const struct ipt_acc_info *info =
+ const struct ipt_acc_info *info =
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+ par->targinfo;
+#else
(const struct ipt_acc_info *)targinfo;
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
u_int32_t src_ip = ip_hdr(skb)->saddr;
u_int32_t dst_ip = ip_hdr(skb)->daddr;
hooks/post-receive
--
high performance accounting for netfilter
--
ipt_ACCOUNT-git - see http://www.intra2net.com/en/developer/ipt_ACCOUNT for
details.
To unsubscribe send a mail to
ipt_ACCOUNT-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|