From 33e74904a7b7613a27603c4df96fe2387e2d0595 Mon Sep 17 00:00:00 2001
From: sven-ola <sven-ola@3484d885-4da6-438d-b19d-107d078dd756>
Date: Wed, 13 Oct 2010 17:05:16 +0000
Subject: --unbalanced

git-svn-id: https://map66.svn.sourceforge.net/svnroot/map66@24 3484d885-4da6-438d-b19d-107d078dd756
---
 libip6t_MAP66.c | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

(limited to 'libip6t_MAP66.c')

diff --git a/libip6t_MAP66.c b/libip6t_MAP66.c
index 9fab6a6..c710a69 100644
--- a/libip6t_MAP66.c
+++ b/libip6t_MAP66.c
@@ -61,8 +61,8 @@ static void MAP66_help(void)
 "MAP66 target options\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"
-"  --offset number                (Use another part of addrs to balance csum)\n"
 "  --nocheck                      (Disables the do-not-map-to-my-addr check)\n"
+"  --unbalanced                   (Don't balance address for csum neutrality)\n"
 "\n"
 "Note: you need two ip6tables rules to map an internal network\n"
 "using ULAs to/from external network with official IPv6 address.\n"
@@ -141,36 +141,14 @@ static int MAP66_parse(
 				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 .. /0)", p + 1);
+			if (0 >= i || 128 < i || 0 != i % 16) {
+				xtables_error(PARAMETER_PROBLEM, "Invalid prefix length in --" IP6T_MAP66_SRC_TO ": \"%s\" (use /128, /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 (!optarg) {
-				xtables_error(PARAMETER_PROBLEM, "--offset: 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 --offset");
-			}
-			if (0 != (IP6T_MAP66_OPT_OFFSET & *flags)) {
-				xtables_error(PARAMETER_PROBLEM, "Multiple --offset not supported");
-			}
-			*flags |= IP6T_MAP66_OPT_OFFSET;
-			i = atoi(p + 1);
-			if (0 > i || 14 <= i) {
-				xtables_error(PARAMETER_PROBLEM, "Invalid value in --offset: \"%s\" (use 0-14)", p + 1);
-			}
-			info->mapoffset = i;
-			return 0;
-		break;
-		case '4':
 			if (0 != (IP6T_MAP66_OPT_NOCHECK & *flags)) {
 				xtables_error(PARAMETER_PROBLEM, "Multiple --nocheck not supported");
 			}
@@ -178,6 +156,14 @@ static int MAP66_parse(
 			*flags |= IP6T_MAP66_OPT_NOCHECK;
 			return 1;
 		break;
+		case '4':
+			if (0 != (IP6T_MAP66_OPT_UNBALANCED & *flags)) {
+				xtables_error(PARAMETER_PROBLEM, "Multiple --unbalanced not supported");
+			}
+			info->mapflags |= IP6T_MAP66_OPT_UNBALANCED;
+			*flags |= IP6T_MAP66_OPT_UNBALANCED;
+			return 1;
+		break;
 	}
 	return 0;
 }
@@ -201,19 +187,19 @@ static void MAP66_save(
 	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 != info->mapoffset)) {
-		printf("--offset %d ", info->mapoffset);
-	}
 	if (0 != (IP6T_MAP66_OPT_NOCHECK & info->mapflags)) {
 		printf("--nocheck ");
 	}
+	if (0 != (IP6T_MAP66_OPT_UNBALANCED & info->mapflags)) {
+		printf("--unbalanced ");
+	}
 }
 
 static struct option MAP66_opts[] = {
 	{ .name = IP6T_MAP66_DST_TO, .has_arg = 1, .flag = NULL, .val = '1' },
 	{ .name = IP6T_MAP66_SRC_TO, .has_arg = 1, .flag = NULL, .val = '2' },
-	{ .name = "offset", .has_arg = 1, .flag = NULL, .val = '3' },
-	{ .name = "nocheck", .has_arg = 0, .flag = NULL, .val = '4' },
+	{ .name = "nocheck", .has_arg = 0, .flag = NULL, .val = '3' },
+	{ .name = "unbalanced", .has_arg = 0, .flag = NULL, .val = '4' },
 	{ .name = NULL }
 };
 
-- 
cgit v1.2.3