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

diff --git a/src/starter/args.c b/src/starter/args.c
index 6dc8f8d10859553e58633e261f0b85bc40951117..af088c44327105d1b5a17249968fbfdbb35319c5 100644 (file)
--- 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 200f42e6b22ee3eeff54c5f8ddd0fb1d745e573b..6713a918659112617f20033571d44ed60035ce0d 100644 (file)
--- 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 0235af409578f8a8f2cb0ffe6e26f9b717165ead..a7fb4a1ffedc04836287380d3b0d9cba90c9f45d 100644 (file)
--- 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 7aadd45c57fcb6951f240ddcc32838c221bfdaa9..7fa27cc1865135947388b29db4620c60e03643ef 100644 (file)
--- 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 59c71a3080adacba4a3ffb7682cde95db13c0139..c0c35a80fa4177bace70b8a5bca656e4e4a2c9b0 100644 (file)
--- 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 ab76eb518c9c24f7b2c1543fbcb40b1189e48f8e..da1b1d0f961db7e103d8bd9764d8e6d2471b4fcd 100644 (file)
--- 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