anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-07 13:15:12 +02:00
Code Issues Releases Wiki Activity

Update compat code for new 2.6.25 code

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
This commit is contained in:
Jan Engelhardt
2008-02-21 13:29:31 +01:00
parent 1e34f02034
commit 75e88a7321
4 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
extensions/compat_xtables.c
View File

@@ -5,6 +5,8 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <net/ip.h>
#include <net/route.h>
#include "compat_xtnu.h" #include "compat_xtnu.h"
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) && \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) && \
@@ -238,4 +240,58 @@ int xtnu_ip_route_me_harder(struct sk_buff *skb, unsigned int addr_type)
EXPORT_SYMBOL_GPL(xtnu_ip_route_me_harder); EXPORT_SYMBOL_GPL(xtnu_ip_route_me_harder);
#endif #endif
#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 24)
static int __xtnu_ip_local_out(struct sk_buff *skb)
{
struct iphdr *iph = ip_hdr(skb);
iph->tot_len = htons(skb->len);
ip_send_check(iph);
return nf_hook(PF_INET, NF_IP_LOCAL_OUT, skb, NULL,
skb->dst->dev, dst_output);
}
int xtnu_ip_local_out(struct sk_buff *skb)
{
int err;
err = __xtnu_ip_local_out(skb);
if (likely(err == 1))
err = dst_output(skb);
return err;
}
EXPORT_SYMBOL_GPL(xtnu_ip_local_out);
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
static int __xtnu_ip_local_out(struct sk_buff **pskb)
{
struct iphdr *iph = ip_hdr(*pskb);
iph->tot_len = htons((*pskb)->len);
ip_send_check(iph);
return nf_hook(PF_INET, NF_IP_LOCAL_OUT, pskb, NULL,
(*pskb)->dst->dev, dst_output);
}
int xtnu_ip_local_out(struct sk_buff *skb)
{
int err;
err = __xtnu_ip_local_out(&skb);
if (likely(err == 1))
err = dst_output(skb);
return err;
}
EXPORT_SYMBOL_GPL(xtnu_ip_local_out);
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
int xtnu_ip_route_output_key(void *net, struct rtable **rp, struct flowi *flp)
{
return ip_route_output_flow(rp, flp, NULL, 0);
}
EXPORT_SYMBOL_GPL(xtnu_ip_route_output_key);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

5
extensions/compat_xtables.h
View File

@@ -9,9 +9,8 @@
# define NF_INET_FORWARD NF_IP_FORWARD # define NF_INET_FORWARD NF_IP_FORWARD
# define NF_INET_LOCAL_OUT NF_IP_LOCAL_OUT # define NF_INET_LOCAL_OUT NF_IP_LOCAL_OUT
# define NF_INET_POST_ROUTING NF_IP_POST_ROUTING # define NF_INET_POST_ROUTING NF_IP_POST_ROUTING
#endif # define init_net xtnu_ip_route_output_key /* yes */
# define ip_route_output_key xtnu_ip_route_output_key
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 24)
# include "compat_nfinetaddr.h" # include "compat_nfinetaddr.h"
#endif #endif

3
extensions/compat_xtnu.h
View File

@@ -5,8 +5,10 @@
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
struct flowi;
struct module; struct module;
struct net_device; struct net_device;
struct rtable;
struct sk_buff; struct sk_buff;
struct xtnu_match { struct xtnu_match {
@@ -61,6 +63,7 @@ static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t)
extern int xtnu_ip_route_me_harder(struct sk_buff *, unsigned int); extern int xtnu_ip_route_me_harder(struct sk_buff *, unsigned int);
extern int xtnu_register_match(struct xtnu_match *); extern int xtnu_register_match(struct xtnu_match *);
extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *);
extern void xtnu_unregister_match(struct xtnu_match *); extern void xtnu_unregister_match(struct xtnu_match *);
extern int xtnu_register_matches(struct xtnu_match *, unsigned int); extern int xtnu_register_matches(struct xtnu_match *, unsigned int);
extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int); extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int);

2
extensions/xt_TEE.c
View File

@@ -62,7 +62,7 @@ static bool tee_routing(struct sk_buff *skb,
}; };
/* Trying to route the packet using the standard routing table. */ /* Trying to route the packet using the standard routing table. */
err = ip_route_output_key(&rt, &fl); err = ip_route_output_key(&init_net, &rt, &fl);
if (err != 0) { if (err != 0) {
if (net_ratelimit()) if (net_ratelimit())
pr_debug(KBUILD_MODNAME pr_debug(KBUILD_MODNAME