From 978e27e8f8c2e49d0528c6c4ae3a56627fbe8492 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 21 Feb 2009 04:42:32 +0100 Subject: include: resynchronize headers with 2.6.29-rc5 Signed-off-by: Jan Engelhardt --- extensions/libipt_NETMAP.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'extensions/libipt_NETMAP.c') diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index f718d2c8..98202303 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #define MODULENAME "NETMAP" @@ -53,7 +53,7 @@ netmask2bits(u_int32_t netmask) static void NETMAP_init(struct xt_entry_target *t) { - struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data; + struct nf_nat_multi_range *mr = (struct nf_nat_multi_range *)t->data; /* Actually, it's 0, but it's ignored at the moment. */ mr->rangesize = 1; @@ -62,7 +62,7 @@ static void NETMAP_init(struct xt_entry_target *t) /* Parses network address */ static void -parse_to(char *arg, struct ip_nat_range *range) +parse_to(char *arg, struct nf_nat_range *range) { char *slash; const struct in_addr *ip; @@ -112,8 +112,8 @@ parse_to(char *arg, struct ip_nat_range *range) static int NETMAP_parse(int c, char **argv, int invert, unsigned int *flags, const void *entry, struct xt_entry_target **target) { - struct ip_nat_multi_range *mr - = (struct ip_nat_multi_range *)(*target)->data; + struct nf_nat_multi_range *mr + = (struct nf_nat_multi_range *)(*target)->data; switch (c) { case '1': @@ -140,9 +140,9 @@ static void NETMAP_check(unsigned int flags) static void NETMAP_print(const void *ip, const struct xt_entry_target *target, int numeric) { - struct ip_nat_multi_range *mr - = (struct ip_nat_multi_range *)target->data; - struct ip_nat_range *r = &mr->range[0]; + struct nf_nat_multi_range *mr + = (struct nf_nat_multi_range *)target->data; + struct nf_nat_range *r = &mr->range[0]; struct in_addr a; int bits; @@ -166,8 +166,8 @@ static struct xtables_target netmap_tg_reg = { .name = MODULENAME, .version = XTABLES_VERSION, .family = NFPROTO_IPV4, - .size = XT_ALIGN(sizeof(struct ip_nat_multi_range)), - .userspacesize = XT_ALIGN(sizeof(struct ip_nat_multi_range)), + .size = XT_ALIGN(sizeof(struct nf_nat_multi_range)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_multi_range)), .help = NETMAP_help, .init = NETMAP_init, .parse = NETMAP_parse, -- cgit v1.2.3