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_DNAT.c | 14 +++++++------- extensions/libipt_MASQUERADE.c | 26 +++++++++++++------------- extensions/libipt_NETMAP.c | 20 ++++++++++---------- extensions/libipt_REDIRECT.c | 26 +++++++++++++------------- extensions/libipt_SAME.c | 8 ++++---- extensions/libipt_SNAT.c | 14 +++++++------- 6 files changed, 54 insertions(+), 54 deletions(-) (limited to 'extensions') diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index f0a23692..b3a3557f 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -7,7 +7,7 @@ #include #include /* get_kernel_version */ #include -#include +#include #define IPT_DNAT_OPT_DEST 0x1 #define IPT_DNAT_OPT_RANDOM 0x2 @@ -17,7 +17,7 @@ struct ipt_natinfo { struct xt_entry_target t; - struct ip_nat_multi_range mr; + struct nf_nat_multi_range mr; }; static void DNAT_help(void) @@ -36,7 +36,7 @@ static const struct option DNAT_opts[] = { }; static struct ipt_natinfo * -append_range(struct ipt_natinfo *info, const struct ip_nat_range *range) +append_range(struct ipt_natinfo *info, const struct nf_nat_range *range) { unsigned int size; @@ -58,7 +58,7 @@ append_range(struct ipt_natinfo *info, const struct ip_nat_range *range) static struct xt_entry_target * parse_to(char *arg, int portok, struct ipt_natinfo *info) { - struct ip_nat_range range; + struct nf_nat_range range; char *colon, *dash, *error; const struct in_addr *ip; @@ -189,7 +189,7 @@ static void DNAT_check(unsigned int flags) "You must specify --to-destination"); } -static void print_range(const struct ip_nat_range *r) +static void print_range(const struct nf_nat_range *r) { if (r->flags & IP_NAT_RANGE_MAP_IPS) { struct in_addr a; @@ -242,8 +242,8 @@ static struct xtables_target dnat_tg_reg = { .name = "DNAT", .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 = DNAT_help, .parse = DNAT_parse, .final_check = DNAT_check, diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index 0180bf6b..b04a9f69 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include static void MASQUERADE_help(void) { @@ -26,7 +26,7 @@ static const struct option MASQUERADE_opts[] = { static void MASQUERADE_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; @@ -35,7 +35,7 @@ static void MASQUERADE_init(struct xt_entry_target *t) /* Parses ports */ static void -parse_ports(const char *arg, struct ip_nat_multi_range *mr) +parse_ports(const char *arg, struct nf_nat_multi_range *mr) { const char *dash; int port; @@ -72,8 +72,8 @@ static int MASQUERADE_parse(int c, char **argv, int invert, unsigned int *flags, { const struct ipt_entry *entry = e; int portok; - 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; if (entry->ip.proto == IPPROTO_TCP || entry->ip.proto == IPPROTO_UDP @@ -110,9 +110,9 @@ static void MASQUERADE_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]; if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { printf("masq ports: "); @@ -129,9 +129,9 @@ MASQUERADE_print(const void *ip, const struct xt_entry_target *target, static void MASQUERADE_save(const void *ip, const struct xt_entry_target *target) { - 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]; if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { printf("--to-ports %hu", ntohs(r->min.tcp.port)); @@ -148,8 +148,8 @@ static struct xtables_target masquerade_tg_reg = { .name = "MASQUERADE", .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 = MASQUERADE_help, .init = MASQUERADE_init, .parse = MASQUERADE_parse, 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, diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c index 8fcb46a9..7ddb35de 100644 --- a/extensions/libipt_REDIRECT.c +++ b/extensions/libipt_REDIRECT.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #define IPT_REDIRECT_OPT_DEST 0x01 #define IPT_REDIRECT_OPT_RANDOM 0x02 @@ -27,7 +27,7 @@ static const struct option REDIRECT_opts[] = { static void REDIRECT_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; @@ -36,7 +36,7 @@ static void REDIRECT_init(struct xt_entry_target *t) /* Parses ports */ static void -parse_ports(const char *arg, struct ip_nat_multi_range *mr) +parse_ports(const char *arg, struct nf_nat_multi_range *mr) { const char *dash; int port; @@ -78,8 +78,8 @@ static int REDIRECT_parse(int c, char **argv, int invert, unsigned int *flags, const void *e, struct xt_entry_target **target) { const struct ipt_entry *entry = e; - 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; int portok; if (entry->ip.proto == IPPROTO_TCP @@ -123,9 +123,9 @@ static int REDIRECT_parse(int c, char **argv, int invert, unsigned int *flags, static void REDIRECT_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]; if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { printf("redir ports "); @@ -140,9 +140,9 @@ static void REDIRECT_print(const void *ip, const struct xt_entry_target *target, static void REDIRECT_save(const void *ip, const struct xt_entry_target *target) { - 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]; if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { printf("--to-ports "); @@ -159,8 +159,8 @@ static struct xtables_target redirect_tg_reg = { .name = "REDIRECT", .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 = REDIRECT_help, .init = REDIRECT_init, .parse = REDIRECT_parse, diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index dabdb3f6..a07d9f48 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* For 64bit kernel / 32bit userspace */ #include @@ -44,7 +44,7 @@ static void SAME_init(struct xt_entry_target *t) /* Parses range of IPs */ static void -parse_to(char *arg, struct ip_nat_range *range) +parse_to(char *arg, struct nf_nat_range *range) { char *dash; const struct in_addr *ip; @@ -145,7 +145,7 @@ static void SAME_print(const void *ip, const struct xt_entry_target *target, printf("same:"); for (count = 0; count < mr->rangesize; count++) { - struct ip_nat_range *r = &mr->range[count]; + struct nf_nat_range *r = &mr->range[count]; struct in_addr a; a.s_addr = r->min_ip; @@ -176,7 +176,7 @@ static void SAME_save(const void *ip, const struct xt_entry_target *target) int random_selection = 0; for (count = 0; count < mr->rangesize; count++) { - struct ip_nat_range *r = &mr->range[count]; + struct nf_nat_range *r = &mr->range[count]; struct in_addr a; a.s_addr = r->min_ip; diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index fda03ea4..cda7d15e 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #define IPT_SNAT_OPT_SOURCE 0x01 #define IPT_SNAT_OPT_RANDOM 0x02 @@ -17,7 +17,7 @@ struct ipt_natinfo { struct xt_entry_target t; - struct ip_nat_multi_range mr; + struct nf_nat_multi_range mr; }; static void SNAT_help(void) @@ -36,7 +36,7 @@ static const struct option SNAT_opts[] = { }; static struct ipt_natinfo * -append_range(struct ipt_natinfo *info, const struct ip_nat_range *range) +append_range(struct ipt_natinfo *info, const struct nf_nat_range *range) { unsigned int size; @@ -58,7 +58,7 @@ append_range(struct ipt_natinfo *info, const struct ip_nat_range *range) static struct xt_entry_target * parse_to(char *arg, int portok, struct ipt_natinfo *info) { - struct ip_nat_range range; + struct nf_nat_range range; char *colon, *dash, *error; const struct in_addr *ip; @@ -190,7 +190,7 @@ static void SNAT_check(unsigned int flags) "You must specify --to-source"); } -static void print_range(const struct ip_nat_range *r) +static void print_range(const struct nf_nat_range *r) { if (r->flags & IP_NAT_RANGE_MAP_IPS) { struct in_addr a; @@ -243,8 +243,8 @@ static struct xtables_target snat_tg_reg = { .name = "SNAT", .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 = SNAT_help, .parse = SNAT_parse, .final_check = SNAT_check, -- cgit v1.2.3