From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 15 May 2012 13:00:15 +0000 (+0200)
Subject: starter: Remove left|rightsubnetwithin option (charon narrows left|rightsubnet down... 
X-Git-Tag: 5.0.0~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ac29be793e3f075d931a572be008febb0e357be;p=thirdparty%2Fstrongswan.git

starter: Remove left|rightsubnetwithin option (charon narrows left|rightsubnet down accordingly).
---

diff --git a/src/starter/args.c b/src/starter/args.c
index 6dc8f8d108..af088c4432 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -254,7 +254,6 @@ static const token_info_t token_info[] =
 	{ ARG_STR,  offsetof(starter_end_t, host), NULL                                },
 	{ ARG_UINT, offsetof(starter_end_t, ikeport), NULL                             },
 	{ ARG_STR,  offsetof(starter_end_t, subnet), NULL                              },
-	{ ARG_MISC, 0, NULL  /* KW_SUBNETWITHIN */                                     },
 	{ ARG_MISC, 0, NULL  /* KW_PROTOPORT */                                        },
 	{ ARG_STR,  offsetof(starter_end_t, sourceip), NULL                            },
 	{ ARG_MISC, 0, NULL  /* KW_NATIP */                                            },
diff --git a/src/starter/cmp.c b/src/starter/cmp.c
index 200f42e6b2..6713a91865 100644
--- a/src/starter/cmp.c
+++ b/src/starter/cmp.c
@@ -36,7 +36,6 @@ starter_cmp_end(starter_end_t *c1, starter_end_t *c2)
 
 	VARCMP(ikeport);
 	VARCMP(has_client);
-	VARCMP(has_client_wildcard);
 	VARCMP(has_port_wildcard);
 	VARCMP(has_natip);
 	VARCMP(has_virt);
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 0235af4095..a7fb4a1ffe 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -294,23 +294,6 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
 	/* individual processing of keywords that were not assigned automatically */
 	switch (token)
 	{
-	case KW_SUBNETWITHIN:
-	{
-		ip_subnet net;
-
-		end->has_client = TRUE;
-		end->has_client_wildcard = TRUE;
-		conn->tunnel_addr_family = ip_version(value);
-
-		ugh = ttosubnet(value, 0, ip_version(value), &net);
-		if (ugh != NULL)
-		{
-			DBG1(DBG_APP, "# bad subnet: %s=%s [%s]", name, value, ugh);
-			goto err;
-		}
-		end->subnet = strdupnull(value);
-		break;
-	}
 	case KW_PROTOPORT:
 		ugh = ttoprotoport(value, 0, &end->protocol, &end->port, &has_port_wildcard);
 		end->has_port_wildcard = has_port_wildcard;
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 7aadd45c57..7fa27cc186 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -74,7 +74,6 @@ struct starter_end {
 		u_int           ikeport;
 		char            *subnet;
 		bool            has_client;
-		bool            has_client_wildcard;
 		bool            has_port_wildcard;
 		bool            has_natip;
 		bool            has_virt;
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 59c71a3080..c0c35a80fa 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -125,7 +125,6 @@ typedef enum {
 	KW_HOST,
 	KW_IKEPORT,
 	KW_SUBNET,
-	KW_SUBNETWITHIN,
 	KW_PROTOPORT,
 	KW_SOURCEIP,
 	KW_NATIP,
@@ -153,7 +152,6 @@ typedef enum {
 	KW_LEFT,
 	KW_LEFTIKEPORT,
 	KW_LEFTSUBNET,
-	KW_LEFTSUBNETWITHIN,
 	KW_LEFTPROTOPORT,
 	KW_LEFTSOURCEIP,
 	KW_LEFTNATIP,
@@ -181,7 +179,6 @@ typedef enum {
 	KW_RIGHT,
 	KW_RIGHTIKEPORT,
 	KW_RIGHTSUBNET,
-	KW_RIGHTSUBNETWITHIN,
 	KW_RIGHTPROTOPORT,
 	KW_RIGHTSOURCEIP,
 	KW_RIGHTNATIP,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index ab76eb518c..da1b1d0f96 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -106,7 +106,6 @@ certuribase,       KW_CERTURIBASE
 left,              KW_LEFT
 leftikeport,       KW_LEFTIKEPORT
 leftsubnet,        KW_LEFTSUBNET
-leftsubnetwithin,  KW_LEFTSUBNETWITHIN
 leftprotoport,     KW_LEFTPROTOPORT
 leftsourceip,      KW_LEFTSOURCEIP
 leftnatip,         KW_LEFTNATIP
@@ -129,7 +128,6 @@ leftgroups,        KW_LEFTGROUPS
 right,             KW_RIGHT
 rightikeport,      KW_RIGHTIKEPORT
 rightsubnet,       KW_RIGHTSUBNET
-rightsubnetwithin, KW_RIGHTSUBNETWITHIN
 rightprotoport,    KW_RIGHTPROTOPORT
 rightsourceip,     KW_RIGHTSOURCEIP
 rightnatip,        KW_RIGHTNATIP