diff options
| -rw-r--r-- | extensions/libip6t_DNAT.c | 184 | ||||
| -rw-r--r-- | extensions/libipt_DNAT.c | 275 | ||||
| -rw-r--r-- | include/linux/netfilter/nf_nat.h | 15 |
3 files changed, 423 insertions, 51 deletions
diff --git a/extensions/libip6t_DNAT.c b/extensions/libip6t_DNAT.c index 8e478b21..2a7574b0 100644 --- a/extensions/libip6t_DNAT.c +++ b/extensions/libip6t_DNAT.c @@ -34,6 +34,15 @@ static void DNAT_help(void) "[--random] [--persistent]\n"); } +static void DNAT_help_v2(void) +{ + printf( +"DNAT target options:\n" +" --to-destination [<ipaddr>[-<ipaddr>]][:port[-port[/port]]]\n" +" Address to map destination to.\n" +"[--random] [--persistent]\n"); +} + static const struct xt_option_entry DNAT_opts[] = { {.name = "to-destination", .id = O_TO_DEST, .type = XTTYPE_STRING, .flags = XTOPT_MAND | XTOPT_MULTI}, @@ -44,7 +53,7 @@ static const struct xt_option_entry DNAT_opts[] = { /* Ranges expected in network order. */ static void -parse_to(const char *orig_arg, int portok, struct nf_nat_range *range) +parse_to(const char *orig_arg, int portok, struct nf_nat_range2 *range, int rev) { char *arg, *start, *end = NULL, *colon = NULL, *dash, *error; const struct in6_addr *ip; @@ -109,6 +118,20 @@ parse_to(const char *orig_arg, int portok, struct nf_nat_range *range) "Port range `%s' funky\n", colon+1); range->min_proto.tcp.port = htons(port); range->max_proto.tcp.port = htons(maxport); + + if (rev >= 2) { + char *slash = strchr(dash, '/'); + if (slash) { + int baseport; + + baseport = atoi(slash + 1); + if (baseport <= 0 || baseport > 65535) + xtables_error(PARAMETER_PROBLEM, + "Port `%s' not valid\n", slash+1); + range->flags |= NF_NAT_RANGE_PROTO_OFFSET; + range->base_proto.tcp.port = htons(baseport); + } + } } /* Starts with colon or [] colon? No IP info...*/ if (colon == arg || colon == arg+2) { @@ -144,10 +167,10 @@ parse_to(const char *orig_arg, int portok, struct nf_nat_range *range) return; } -static void DNAT_parse(struct xt_option_call *cb) +static void _DNAT_parse(struct xt_option_call *cb, + struct nf_nat_range2 *range, int rev) { const struct ip6t_entry *entry = cb->xt_entry; - struct nf_nat_range *range = cb->data; int portok; if (entry->ipv6.proto == IPPROTO_TCP || @@ -166,7 +189,7 @@ static void DNAT_parse(struct xt_option_call *cb) xtables_error(PARAMETER_PROBLEM, "DNAT: Multiple --to-destination not supported"); } - parse_to(cb->arg, portok, range); + parse_to(cb->arg, portok, range, rev); cb->xflags |= F_X_TO_DEST; break; case O_PERSISTENT: @@ -175,16 +198,40 @@ static void DNAT_parse(struct xt_option_call *cb) } } -static void DNAT_fcheck(struct xt_fcheck_call *cb) +static void DNAT_parse(struct xt_option_call *cb) +{ + struct nf_nat_range *range_v1 = (void *)cb->data; + struct nf_nat_range2 range = {}; + + memcpy(&range, range_v1, sizeof(*range_v1)); + _DNAT_parse(cb, &range, 1); + memcpy(range_v1, &range, sizeof(*range_v1)); +} + +static void DNAT_parse_v2(struct xt_option_call *cb) +{ + _DNAT_parse(cb, (struct nf_nat_range2 *)cb->data, 2); +} + +static void _DNAT_fcheck(struct xt_fcheck_call *cb, unsigned int *flags) { static const unsigned int f = F_TO_DEST | F_RANDOM; - struct nf_nat_range *mr = cb->data; if ((cb->xflags & f) == f) - mr->flags |= NF_NAT_RANGE_PROTO_RANDOM; + *flags |= NF_NAT_RANGE_PROTO_RANDOM; +} + +static void DNAT_fcheck(struct xt_fcheck_call *cb) +{ + _DNAT_fcheck(cb, &((struct nf_nat_range *)cb->data)->flags); } -static void print_range(const struct nf_nat_range *range) +static void DNAT_fcheck_v2(struct xt_fcheck_call *cb) +{ + _DNAT_fcheck(cb, &((struct nf_nat_range2 *)cb->data)->flags); +} + +static void print_range(const struct nf_nat_range2 *range, int rev) { if (range->flags & NF_NAT_RANGE_MAP_IPS) { if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) @@ -201,36 +248,63 @@ static void print_range(const struct nf_nat_range *range) printf("%hu", ntohs(range->min_proto.tcp.port)); if (range->max_proto.tcp.port != range->min_proto.tcp.port) printf("-%hu", ntohs(range->max_proto.tcp.port)); + if (rev >= 2 && (range->flags & NF_NAT_RANGE_PROTO_OFFSET)) + printf("/%hu", ntohs(range->base_proto.tcp.port)); } } -static void DNAT_print(const void *ip, const struct xt_entry_target *target, - int numeric) +static void _DNAT_print(const struct nf_nat_range2 *range, int rev) { - const struct nf_nat_range *range = (const void *)target->data; - printf(" to:"); - print_range(range); + print_range(range, rev); if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) printf(" random"); if (range->flags & NF_NAT_RANGE_PERSISTENT) printf(" persistent"); } -static void DNAT_save(const void *ip, const struct xt_entry_target *target) +static void DNAT_print(const void *ip, const struct xt_entry_target *target, + int numeric) { - const struct nf_nat_range *range = (const void *)target->data; + const struct nf_nat_range *range_v1 = (const void *)target->data; + struct nf_nat_range2 range = {}; + memcpy(&range, range_v1, sizeof(*range_v1)); + _DNAT_print(&range, 1); +} + +static void DNAT_print_v2(const void *ip, const struct xt_entry_target *target, + int numeric) +{ + _DNAT_print((const struct nf_nat_range2 *)target->data, 2); +} + +static void _DNAT_save(const struct nf_nat_range2 *range, int rev) +{ printf(" --to-destination "); - print_range(range); + print_range(range, rev); if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) printf(" --random"); if (range->flags & NF_NAT_RANGE_PERSISTENT) printf(" --persistent"); } -static void print_range_xlate(const struct nf_nat_range *range, - struct xt_xlate *xl) +static void DNAT_save(const void *ip, const struct xt_entry_target *target) +{ + const struct nf_nat_range *range_v1 = (const void *)target->data; + struct nf_nat_range2 range = {}; + + memcpy(&range, range_v1, sizeof(*range_v1)); + _DNAT_save(&range, 1); +} + +static void DNAT_save_v2(const void *ip, const struct xt_entry_target *target) +{ + _DNAT_save((const struct nf_nat_range2 *)target->data, 2); +} + +static void print_range_xlate(const struct nf_nat_range2 *range, + struct xt_xlate *xl, int rev) { bool proto_specified = range->flags & NF_NAT_RANGE_PROTO_SPECIFIED; @@ -257,15 +331,14 @@ static void print_range_xlate(const struct nf_nat_range *range, } } -static int DNAT_xlate(struct xt_xlate *xl, - const struct xt_xlate_tg_params *params) +static int _DNAT_xlate(struct xt_xlate *xl, + const struct nf_nat_range2 *range, int rev) { - const struct nf_nat_range *range = (const void *)params->target->data; bool sep_need = false; const char *sep = " "; xt_xlate_add(xl, "dnat to "); - print_range_xlate(range, xl); + print_range_xlate(range, xl, rev); if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) { xt_xlate_add(xl, " random"); sep_need = true; @@ -279,23 +352,60 @@ static int DNAT_xlate(struct xt_xlate *xl, return 1; } -static struct xtables_target dnat_tg_reg = { - .name = "DNAT", - .version = XTABLES_VERSION, - .family = NFPROTO_IPV6, - .revision = 1, - .size = XT_ALIGN(sizeof(struct nf_nat_range)), - .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), - .help = DNAT_help, - .x6_parse = DNAT_parse, - .x6_fcheck = DNAT_fcheck, - .print = DNAT_print, - .save = DNAT_save, - .x6_options = DNAT_opts, - .xlate = DNAT_xlate, +static int DNAT_xlate(struct xt_xlate *xl, + const struct xt_xlate_tg_params *params) +{ + const struct nf_nat_range *range_v1 = (const void *)params->target->data; + struct nf_nat_range2 range = {}; + + memcpy(&range, range_v1, sizeof(*range_v1)); + _DNAT_xlate(xl, &range, 1); + + return 1; +} + +static int DNAT_xlate_v2(struct xt_xlate *xl, + const struct xt_xlate_tg_params *params) +{ + _DNAT_xlate(xl, (const struct nf_nat_range2 *)params->target->data, 2); + + return 1; +} + +static struct xtables_target dnat_tg_reg[] = { + { + .name = "DNAT", + .version = XTABLES_VERSION, + .family = NFPROTO_IPV6, + .revision = 1, + .size = XT_ALIGN(sizeof(struct nf_nat_range)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), + .help = DNAT_help, + .print = DNAT_print, + .save = DNAT_save, + .x6_parse = DNAT_parse, + .x6_fcheck = DNAT_fcheck, + .x6_options = DNAT_opts, + .xlate = DNAT_xlate, + }, + { + .name = "DNAT", + .version = XTABLES_VERSION, + .family = NFPROTO_IPV6, + .revision = 2, + .size = XT_ALIGN(sizeof(struct nf_nat_range)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), + .help = DNAT_help_v2, + .print = DNAT_print_v2, + .save = DNAT_save_v2, + .x6_parse = DNAT_parse_v2, + .x6_fcheck = DNAT_fcheck_v2, + .x6_options = DNAT_opts, + .xlate = DNAT_xlate_v2, + }, }; void _init(void) { - xtables_register_target(&dnat_tg_reg); + xtables_register_targets(dnat_tg_reg, ARRAY_SIZE(dnat_tg_reg)); } diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index a14d16f7..b89d3ca5 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -35,6 +35,15 @@ static void DNAT_help(void) "[--random] [--persistent]\n"); } +static void DNAT_help_v2(void) +{ + printf( +"DNAT target options:\n" +" --to-destination [<ipaddr>[-<ipaddr>]][:port[-port[/port]]]\n" +" Address to map destination to.\n" +"[--random] [--persistent]\n"); +} + static const struct xt_option_entry DNAT_opts[] = { {.name = "to-destination", .id = O_TO_DEST, .type = XTTYPE_STRING, .flags = XTOPT_MAND | XTOPT_MULTI}, @@ -287,22 +296,260 @@ static int DNAT_xlate(struct xt_xlate *xl, return 1; } -static struct xtables_target dnat_tg_reg = { - .name = "DNAT", - .version = XTABLES_VERSION, - .family = NFPROTO_IPV4, - .size = XT_ALIGN(sizeof(struct nf_nat_ipv4_multi_range_compat)), - .userspacesize = XT_ALIGN(sizeof(struct nf_nat_ipv4_multi_range_compat)), - .help = DNAT_help, - .x6_parse = DNAT_parse, - .x6_fcheck = DNAT_fcheck, - .print = DNAT_print, - .save = DNAT_save, - .x6_options = DNAT_opts, - .xlate = DNAT_xlate, +static void +parse_to_v2(const char *orig_arg, int portok, struct nf_nat_range2 *range) +{ + char *arg, *colon, *dash, *error; + const struct in_addr *ip; + + arg = strdup(orig_arg); + if (arg == NULL) + xtables_error(RESOURCE_PROBLEM, "strdup"); + + colon = strchr(arg, ':'); + if (colon) { + int port; + + if (!portok) + xtables_error(PARAMETER_PROBLEM, + "Need TCP, UDP, SCTP or DCCP with port specification"); + + range->flags |= NF_NAT_RANGE_PROTO_SPECIFIED; + + port = atoi(colon+1); + if (port <= 0 || port > 65535) + xtables_error(PARAMETER_PROBLEM, + "Port `%s' not valid\n", colon+1); + + error = strchr(colon+1, ':'); + if (error) + xtables_error(PARAMETER_PROBLEM, + "Invalid port:port syntax - use dash\n"); + + dash = strchr(colon, '-'); + if (!dash) { + range->min_proto.tcp.port + = range->max_proto.tcp.port + = htons(port); + } else { + int maxport; + char *slash; + + maxport = atoi(dash + 1); + if (maxport <= 0 || maxport > 65535) + xtables_error(PARAMETER_PROBLEM, + "Port `%s' not valid\n", dash+1); + if (maxport < port) + /* People are stupid. */ + xtables_error(PARAMETER_PROBLEM, + "Port range `%s' funky\n", colon+1); + range->min_proto.tcp.port = htons(port); + range->max_proto.tcp.port = htons(maxport); + + slash = strchr(dash, '/'); + if (slash) { + int baseport; + + baseport = atoi(slash + 1); + if (baseport <= 0 || baseport > 65535) + xtables_error(PARAMETER_PROBLEM, + "Port `%s' not valid\n", slash+1); + range->flags |= NF_NAT_RANGE_PROTO_OFFSET; + range->base_proto.tcp.port = htons(baseport); + } + } + /* Starts with a colon? No IP info...*/ + if (colon == arg) { + free(arg); + return; + } + *colon = '\0'; + } + + range->flags |= NF_NAT_RANGE_MAP_IPS; + dash = strchr(arg, '-'); + if (colon && dash && dash > colon) + dash = NULL; + + if (dash) + *dash = '\0'; + + ip = xtables_numeric_to_ipaddr(arg); + if (!ip) + xtables_error(PARAMETER_PROBLEM, "Bad IP address \"%s\"\n", + arg); + range->min_addr.in = *ip; + if (dash) { + ip = xtables_numeric_to_ipaddr(dash+1); + if (!ip) + xtables_error(PARAMETER_PROBLEM, "Bad IP address \"%s\"\n", + dash+1); + range->max_addr.in = *ip; + } else + range->max_addr = range->min_addr; + + free(arg); + return; +} + +static void DNAT_parse_v2(struct xt_option_call *cb) +{ + const struct ipt_entry *entry = cb->xt_entry; + struct nf_nat_range2 *range = cb->data; + int portok; + + if (entry->ip.proto == IPPROTO_TCP + || entry->ip.proto == IPPROTO_UDP + || entry->ip.proto == IPPROTO_SCTP + || entry->ip.proto == IPPROTO_DCCP + || entry->ip.proto == IPPROTO_ICMP) + portok = 1; + else + portok = 0; + + xtables_option_parse(cb); + switch (cb->entry->id) { + case O_TO_DEST: + if (cb->xflags & F_X_TO_DEST) { + xtables_error(PARAMETER_PROBLEM, + "DNAT: Multiple --to-destination not supported"); + } + parse_to_v2(cb->arg, portok, range); + cb->xflags |= F_X_TO_DEST; + break; + case O_PERSISTENT: + range->flags |= NF_NAT_RANGE_PERSISTENT; + break; + } +} + +static void DNAT_fcheck_v2(struct xt_fcheck_call *cb) +{ + static const unsigned int f = F_TO_DEST | F_RANDOM; + struct nf_nat_range2 *range = cb->data; + + if ((cb->xflags & f) == f) + range->flags |= NF_NAT_RANGE_PROTO_RANDOM; +} + +static void print_range_v2(const struct nf_nat_range2 *range) +{ + if (range->flags & NF_NAT_RANGE_MAP_IPS) { + printf("%s", xtables_ipaddr_to_numeric(&range->min_addr.in)); + if (memcmp(&range->min_addr, &range->max_addr, + sizeof(range->min_addr))) + printf("-%s", xtables_ipaddr_to_numeric(&range->max_addr.in)); + } + if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) { + printf(":"); + printf("%hu", ntohs(range->min_proto.tcp.port)); + if (range->max_proto.tcp.port != range->min_proto.tcp.port) + printf("-%hu", ntohs(range->max_proto.tcp.port)); + if (range->flags & NF_NAT_RANGE_PROTO_OFFSET) + printf("/%hu", ntohs(range->base_proto.tcp.port)); + } +} + +static void DNAT_print_v2(const void *ip, const struct xt_entry_target *target, + int numeric) +{ + const struct nf_nat_range2 *range = (const void *)target->data; + + printf(" to:"); + print_range_v2(range); + if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) + printf(" random"); + if (range->flags & NF_NAT_RANGE_PERSISTENT) + printf(" persistent"); +} + +static void DNAT_save_v2(const void *ip, const struct xt_entry_target *target) +{ + const struct nf_nat_range2 *range = (const void *)target->data; + + printf(" --to-destination "); + print_range_v2(range); + if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) + printf(" --random"); + if (range->flags & NF_NAT_RANGE_PERSISTENT) + printf(" --persistent"); +} + +static void print_range_xlate_v2(const struct nf_nat_range2 *range, + struct xt_xlate *xl) +{ + if (range->flags & NF_NAT_RANGE_MAP_IPS) { + xt_xlate_add(xl, "%s", xtables_ipaddr_to_numeric(&range->min_addr.in)); + if (memcmp(&range->min_addr, &range->max_addr, + sizeof(range->min_addr))) { + xt_xlate_add(xl, "-%s", xtables_ipaddr_to_numeric(&range->max_addr.in)); + } + } + if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) { + xt_xlate_add(xl, ":%hu", ntohs(range->min_proto.tcp.port)); + if (range->max_proto.tcp.port != range->min_proto.tcp.port) + xt_xlate_add(xl, "-%hu", ntohs(range->max_proto.tcp.port)); + if (range->flags & NF_NAT_RANGE_PROTO_OFFSET) + xt_xlate_add(xl, ";%hu", ntohs(range->base_proto.tcp.port)); + } +} + +static int DNAT_xlate_v2(struct xt_xlate *xl, + const struct xt_xlate_tg_params *params) +{ + const struct nf_nat_range2 *range = (const void *)params->target->data; + bool sep_need = false; + const char *sep = " "; + + xt_xlate_add(xl, "dnat to "); + print_range_xlate_v2(range, xl); + if (range->flags & NF_NAT_RANGE_PROTO_RANDOM) { + xt_xlate_add(xl, " random"); + sep_need = true; + } + if (range->flags & NF_NAT_RANGE_PERSISTENT) { + if (sep_need) + sep = ","; + xt_xlate_add(xl, "%spersistent", sep); + } + + return 1; +} + +static struct xtables_target dnat_tg_reg[] = { + { + .name = "DNAT", + .version = XTABLES_VERSION, + .family = NFPROTO_IPV4, + .revision = 0, + .size = XT_ALIGN(sizeof(struct nf_nat_ipv4_multi_range_compat)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_ipv4_multi_range_compat)), + .help = DNAT_help, + .print = DNAT_print, + .save = DNAT_save, + .x6_parse = DNAT_parse, + .x6_fcheck = DNAT_fcheck, + .x6_options = DNAT_opts, + .xlate = DNAT_xlate, + }, + { + .name = "DNAT", + .version = XTABLES_VERSION, + .family = NFPROTO_IPV4, + .revision = 2, + .size = XT_ALIGN(sizeof(struct nf_nat_range)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), + .help = DNAT_help_v2, + .print = DNAT_print_v2, + .save = DNAT_save_v2, + .x6_parse = DNAT_parse_v2, + .x6_fcheck = DNAT_fcheck_v2, + .x6_options = DNAT_opts, + .xlate = DNAT_xlate_v2, + }, }; void _init(void) { - xtables_register_target(&dnat_tg_reg); + xtables_register_targets(dnat_tg_reg, ARRAY_SIZE(dnat_tg_reg)); } diff --git a/include/linux/netfilter/nf_nat.h b/include/linux/netfilter/nf_nat.h index 1ad36591..b600000d 100644 --- a/include/linux/netfilter/nf_nat.h +++ b/include/linux/netfilter/nf_nat.h @@ -9,10 +9,16 @@ #define NF_NAT_RANGE_PROTO_RANDOM (1 << 2) #define NF_NAT_RANGE_PERSISTENT (1 << 3) #define NF_NAT_RANGE_PROTO_RANDOM_FULLY (1 << 4) +#define NF_NAT_RANGE_PROTO_OFFSET (1 << 5) #define NF_NAT_RANGE_PROTO_RANDOM_ALL \ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY) +#define NF_NAT_RANGE_MASK \ + (NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED | \ + NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT | \ + NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET) + struct nf_nat_ipv4_range { unsigned int flags; __be32 min_ip; @@ -34,4 +40,13 @@ struct nf_nat_range { union nf_conntrack_man_proto max_proto; }; +struct nf_nat_range2 { + unsigned int flags; + union nf_inet_addr min_addr; + union nf_inet_addr max_addr; + union nf_conntrack_man_proto min_proto; + union nf_conntrack_man_proto max_proto; + union nf_conntrack_man_proto base_proto; +}; + #endif /* _NETFILTER_NF_NAT_H */ |