diff options
Diffstat (limited to 'libip6t_MAP66.c')
| -rw-r--r-- | libip6t_MAP66.c | 83 |
1 files changed, 61 insertions, 22 deletions
diff --git a/libip6t_MAP66.c b/libip6t_MAP66.c index 1d56d7f..a3705b6 100644 --- a/libip6t_MAP66.c +++ b/libip6t_MAP66.c @@ -59,16 +59,17 @@ static void MAP66_help(void) { printf( "MAP66 target options\n" -" --to ipv6addr/prefixlength (External IPv6 address)\n" -" --nocheck (Disables check check)\n" +" " IP6T_MAP66_DST_TO " ipv6addr/prefixlength (Prefix to map IPv6 destination address to)\n" +" " IP6T_MAP66_SRC_TO " ipv6addr/prefixlength (Prefix to map IPv6 source address to)\n" +" --nocheck (Disables the do-not-map-to-my-addr check)\n" "\n" "Note: you need two ip6tables rules to map an internal network\n" -"using ULAs to an external network with official IPv6 address.\n" +"using ULAs to/from external network with official IPv6 address.\n" "\n" "Example:\n" "\n" -"ip6tables -t mangle -I PREROUTING -i eth0 -d 2001:0DB8:0001::/48 -j MAP66 --to FD01:0203:0405::/48\n" -"ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j MAP66 --to 2001:0DB8:0001::/48\n"); +"ip6tables -t mangle -I PREROUTING -i eth0 -d 2001:0DB8:0001::/48 -j MAP66 " IP6T_MAP66_DST_TO " FD01:0203:0405::/48\n" +"ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j MAP66 " IP6T_MAP66_SRC_TO " 2001:0DB8:0001::/48\n"); } static int MAP66_parse( @@ -86,35 +87,65 @@ static int MAP66_parse( switch(c) { case '1': if (!optarg) { - xtables_error(PARAMETER_PROBLEM, "--to: You must specify a value"); + xtables_error(PARAMETER_PROBLEM, IP6T_MAP66_DST_TO ": You must specify a value"); } if (xtables_check_inverse(optarg, &invert, NULL, 0 #if IPTABLES_VERSION_CODE >= IPTABLES_VERSION_CMP(1,4,6) ,argv #endif )) { - xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after --to"); + xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after " IP6T_MAP66_DST_TO); } - if (0 != (IP6T_MAP66_OPT_TO & *flags)) { - xtables_error(PARAMETER_PROBLEM, "Multiple --to not supported"); + if (0 != (IP6T_MAP66_OPT_DST_TO & *flags)) { + xtables_error(PARAMETER_PROBLEM, "Multiple " IP6T_MAP66_DST_TO " not supported"); } - *flags |= IP6T_MAP66_OPT_TO; + *flags |= IP6T_MAP66_OPT_DST_TO; if (NULL == (p = strchr(optarg, '/'))) { - xtables_error(PARAMETER_PROBLEM, "Missing '/' character in --to: \"%s\"", optarg); + xtables_error(PARAMETER_PROBLEM, "Missing '/' character in " IP6T_MAP66_DST_TO ": \"%s\"", optarg); } *p = '\0'; - if (1 != inet_pton(AF_INET6, optarg, &info->prefix)) { - xtables_error(PARAMETER_PROBLEM, "Invalid IPv6 address in --to: \"%s\"", optarg); + if (1 != inet_pton(AF_INET6, optarg, &info->pfix_dst_to)) { + xtables_error(PARAMETER_PROBLEM, "Invalid IPv6 address in " IP6T_MAP66_DST_TO ": \"%s\"", optarg); } i = atoi(p + 1); if (0 >= i || 128 <= i || 0 != i % 16) { - xtables_error(PARAMETER_PROBLEM, "Invalid prefix length in --to: \"%s\" (use /112, /96 .. /16)", p + 1); + xtables_error(PARAMETER_PROBLEM, "Invalid prefix length in " IP6T_MAP66_DST_TO ": \"%s\" (use /112, /96 .. /16)", p + 1); } - info->prefixlength = i / 16; - info->prefixcsum = ~csum16((const u_int16_t *)&info->prefix, info->prefixlength); + info->pfix_dst_len = i / 16; + info->pfix_dst_csum = ~csum16((const u_int16_t *)&info->pfix_dst_to, info->pfix_dst_len); return 1; break; case '2': + if (!optarg) { + xtables_error(PARAMETER_PROBLEM, IP6T_MAP66_SRC_TO ": You must specify a value"); + } + if (xtables_check_inverse(optarg, &invert, NULL, 0 +#if IPTABLES_VERSION_CODE >= IPTABLES_VERSION_CMP(1,4,6) + ,argv +#endif + )) { + xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after " IP6T_MAP66_SRC_TO); + } + if (0 != (IP6T_MAP66_OPT_SRC_TO & *flags)) { + xtables_error(PARAMETER_PROBLEM, "Multiple " IP6T_MAP66_SRC_TO " not supported"); + } + *flags |= IP6T_MAP66_OPT_SRC_TO; + if (NULL == (p = strchr(optarg, '/'))) { + xtables_error(PARAMETER_PROBLEM, "Missing '/' character in " IP6T_MAP66_SRC_TO ": \"%s\"", optarg); + } + *p = '\0'; + if (1 != inet_pton(AF_INET6, optarg, &info->pfix_src_to)) { + xtables_error(PARAMETER_PROBLEM, "Invalid IPv6 address in " IP6T_MAP66_SRC_TO ": \"%s\"", optarg); + } + i = atoi(p + 1); + if (0 >= i || 128 <= i || 0 != i % 16) { + xtables_error(PARAMETER_PROBLEM, "Invalid prefix length in " IP6T_MAP66_SRC_TO ": \"%s\" (use /112, /96 .. /16)", p + 1); + } + info->pfix_src_len = i / 16; + info->pfix_src_csum = ~csum16((const u_int16_t *)&info->pfix_src_to, info->pfix_src_len); + return 1; + break; + case '3': if (0 != (IP6T_MAP66_OPT_NOCHECK & *flags)) { xtables_error(PARAMETER_PROBLEM, "Multiple --nocheck not supported"); } @@ -128,8 +159,8 @@ static int MAP66_parse( static void MAP66_check(unsigned int flags) { - if (!(flags & IP6T_MAP66_OPT_TO)) { - xtables_error(PARAMETER_PROBLEM, "You must specify --to"); + if (0 == ((IP6T_MAP66_OPT_DST_TO | IP6T_MAP66_OPT_SRC_TO) & flags)) { + xtables_error(PARAMETER_PROBLEM, "You must specify " IP6T_MAP66_DST_TO " or " IP6T_MAP66_SRC_TO); } } @@ -139,13 +170,21 @@ static void MAP66_save( { char s[50+1]; const struct ip6t_MAP66_info* info = (struct ip6t_MAP66_info*)target->data; - printf("--to %s/%d ", inet_ntop(AF_INET6, &info->prefix, s, sizeof(s)), 16 * info->prefixlength); - if (0 != (IP6T_MAP66_OPT_NOCHECK & info->mapflags)) printf("--nocheck "); + if (0 != (IP6T_MAP66_OPT_DST_TO & info->mapflags)) { + printf(IP6T_MAP66_DST_TO " %s/%d ", inet_ntop(AF_INET6, &info->pfix_dst_to, s, sizeof(s)), 16 * info->pfix_dst_len); + } + if (0 != (IP6T_MAP66_OPT_SRC_TO & info->mapflags)) { + printf(IP6T_MAP66_SRC_TO " %s/%d ", inet_ntop(AF_INET6, &info->pfix_src_to, s, sizeof(s)), 16 * info->pfix_src_len); + } + if (0 != (IP6T_MAP66_OPT_NOCHECK & info->mapflags)) { + printf("--nocheck "); + } } static struct option MAP66_opts[] = { - { .name = "to", .has_arg = 1, .flag = NULL, .val = '1' }, - { .name = "nocheck", .has_arg = 0, .flag = NULL, .val = '2' }, + { .name = "dst-to", .has_arg = 1, .flag = NULL, .val = '1' }, + { .name = "src-to", .has_arg = 1, .flag = NULL, .val = '2' }, + { .name = "nocheck", .has_arg = 0, .flag = NULL, .val = '3' }, { .name = NULL } }; |