starter: Remove left|rightnexthop option.

Charon does this lookup dynamically.

6 files changed, 0 insertions, 26 deletions

diff --git a/src/starter/args.c b/src/starter/args.c
index a9a1632ee..3531bf77c 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -271,7 +271,6 @@ static const token_info_t token_info[] =
 	/* end keywords */
 	{ ARG_STR,  offsetof(starter_end_t, host), NULL                                },
 	{ ARG_UINT, offsetof(starter_end_t, ikeport), NULL                             },
-	{ ARG_MISC, 0, NULL  /* KW_NEXTHOP */                                          },
 	{ ARG_STR, offsetof(starter_end_t, subnet), NULL                               },
 	{ ARG_MISC, 0, NULL  /* KW_SUBNETWITHIN */                                     },
 	{ ARG_MISC, 0, NULL  /* KW_PROTOPORT */                                        },
diff --git a/src/starter/cmp.c b/src/starter/cmp.c
index 0072e3ed7..f13314e1a 100644
--- a/src/starter/cmp.c
+++ b/src/starter/cmp.c
@@ -43,7 +43,6 @@ starter_cmp_end(starter_end_t *c1, starter_end_t *c2)
 		ADDCMP(addr);
 	}
 	VARCMP(ikeport);
-	ADDCMP(nexthop);
 	VARCMP(has_client);
 	VARCMP(has_client_wildcard);
 	VARCMP(has_port_wildcard);
diff --git a/src/starter/confread.c b/src/starter/confread.c
index e674a6a7f..cc94b85c3 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -106,9 +106,7 @@ static void default_values(starter_config_t *cfg)
 	cfg->conn_default.right.sendcert = CERT_SEND_IF_ASKED;
 
 	anyaddr(AF_INET, &cfg->conn_default.left.addr);
-	anyaddr(AF_INET, &cfg->conn_default.left.nexthop);
 	anyaddr(AF_INET, &cfg->conn_default.right.addr);
-	anyaddr(AF_INET, &cfg->conn_default.right.nexthop);
 	cfg->conn_default.left.ikeport = 500;
 	cfg->conn_default.right.ikeport = 500;
 
@@ -336,22 +334,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_NEXTHOP:
-		if (streq(value, "%direct"))
-		{
-			ugh = anyaddr(conn->addr_family, &end->nexthop);
-		}
-		else
-		{
-			conn->addr_family = ip_version(value);
-			ugh = ttoaddr(value, 0, conn->addr_family, &end->nexthop);
-		}
-		if (ugh != NULL)
-		{
-			DBG1(DBG_APP, "# bad addr: %s=%s [%s]", name, value, ugh);
-			goto err;
-		}
-		break;
 	case KW_SUBNETWITHIN:
 	{
 		ip_subnet net;
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 0907997e5..42f99831d 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -68,7 +68,6 @@ struct starter_end {
 		char            *host;
 		ip_address      addr;
 		u_int           ikeport;
-		ip_address      nexthop;
 		char            *subnet;
 		bool            has_client;
 		bool            has_client_wildcard;
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 3374fa8c7..c1b98dffc 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -126,7 +126,6 @@ typedef enum {
    /* end keywords */
 	KW_HOST,
 	KW_IKEPORT,
-	KW_NEXTHOP,
 	KW_SUBNET,
 	KW_SUBNETWITHIN,
 	KW_PROTOPORT,
@@ -156,7 +155,6 @@ typedef enum {
    /* left end keywords */
 	KW_LEFT,
 	KW_LEFTIKEPORT,
-	KW_LEFTNEXTHOP,
 	KW_LEFTSUBNET,
 	KW_LEFTSUBNETWITHIN,
 	KW_LEFTPROTOPORT,
@@ -185,7 +183,6 @@ typedef enum {
    /* right end keywords */
 	KW_RIGHT,
 	KW_RIGHTIKEPORT,
-	KW_RIGHTNEXTHOP,
 	KW_RIGHTSUBNET,
 	KW_RIGHTSUBNETWITHIN,
 	KW_RIGHTPROTOPORT,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index d31fd2461..96221778d 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -107,7 +107,6 @@ ocspuri2,          KW_OCSPURI2
 certuribase,       KW_CERTURIBASE
 left,              KW_LEFT
 leftikeport,       KW_LEFTIKEPORT
-leftnexthop,       KW_LEFTNEXTHOP
 leftsubnet,        KW_LEFTSUBNET
 leftsubnetwithin,  KW_LEFTSUBNETWITHIN
 leftprotoport,     KW_LEFTPROTOPORT
@@ -131,7 +130,6 @@ leftca2,           KW_LEFTCA2
 leftgroups,        KW_LEFTGROUPS
 right,             KW_RIGHT
 rightikeport,      KW_RIGHTIKEPORT
-rightnexthop,      KW_RIGHTNEXTHOP
 rightsubnet,       KW_RIGHTSUBNET
 rightsubnetwithin, KW_RIGHTSUBNETWITHIN
 rightprotoport,    KW_RIGHTPROTOPORT