git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ipt_NETMAP.c
diff --git
a/net/ipv4/netfilter/ipt_NETMAP.c
b/net/ipv4/netfilter/ipt_NETMAP.c
index
736c4b5
..
9390e90
100644
(file)
--- a/
net/ipv4/netfilter/ipt_NETMAP.c
+++ b/
net/ipv4/netfilter/ipt_NETMAP.c
@@
-15,7
+15,11
@@
#include <linux/netdevice.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4.h>
#include <linux/netdevice.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4.h>
+#ifdef CONFIG_NF_NAT_NEEDED
+#include <net/netfilter/nf_nat_rule.h>
+#else
#include <linux/netfilter_ipv4/ip_nat_rule.h>
#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#endif
#define MODULENAME "NETMAP"
MODULE_LICENSE("GPL");
#define MODULENAME "NETMAP"
MODULE_LICENSE("GPL");
@@
-33,7
+37,6
@@
check(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
const void *e,
const struct xt_target *target,
void *targinfo,
- unsigned int targinfosize,
unsigned int hook_mask)
{
const struct ip_nat_multi_range_compat *mr = targinfo;
unsigned int hook_mask)
{
const struct ip_nat_multi_range_compat *mr = targinfo;
@@
-55,12
+58,11
@@
target(struct sk_buff **pskb,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
const struct net_device *out,
unsigned int hooknum,
const struct xt_target *target,
- const void *targinfo,
- void *userinfo)
+ const void *targinfo)
{
struct ip_conntrack *ct;
enum ip_conntrack_info ctinfo;
{
struct ip_conntrack *ct;
enum ip_conntrack_info ctinfo;
-
u_int32_t
new_ip, netmask;
+
__be32
new_ip, netmask;
const struct ip_nat_multi_range_compat *mr = targinfo;
struct ip_nat_range newrange;
const struct ip_nat_multi_range_compat *mr = targinfo;
struct ip_nat_range newrange;