diff options
author | Martin Willi <martin@revosec.ch> | 2012-08-21 09:32:33 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2012-08-21 09:38:01 +0200 |
commit | da646ab94ad2cc246819bf1a023b4394745004f4 (patch) | |
tree | 6372a8a0e12fb48ecb551eb398e7e02c45b5fe50 /src/starter | |
parent | 2b08ae45244b22ffba0d68da63a1a9c58dc08ea9 (diff) | |
download | strongswan-da646ab94ad2cc246819bf1a023b4394745004f4.tar.bz2 strongswan-da646ab94ad2cc246819bf1a023b4394745004f4.tar.xz |
Remove unused ipsec.conf left/rightnatip keyword
Diffstat (limited to 'src/starter')
-rw-r--r-- | src/starter/args.c | 1 | ||||
-rw-r--r-- | src/starter/cmp.c | 1 | ||||
-rw-r--r-- | src/starter/confread.c | 26 | ||||
-rw-r--r-- | src/starter/confread.h | 1 | ||||
-rw-r--r-- | src/starter/keywords.h | 3 | ||||
-rw-r--r-- | src/starter/keywords.txt | 2 |
6 files changed, 0 insertions, 34 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 13ffec61d..eb25b2abb 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -187,7 +187,6 @@ static const token_info_t token_info[] = { ARG_MISC, 0, NULL /* KW_PROTOPORT */ }, { ARG_STR, offsetof(starter_end_t, sourceip), NULL }, { ARG_STR, offsetof(starter_end_t, dns), NULL }, - { ARG_MISC, 0, NULL /* KW_NATIP */ }, { ARG_ENUM, offsetof(starter_end_t, firewall), LST_bool }, { ARG_ENUM, offsetof(starter_end_t, hostaccess), LST_bool }, { ARG_ENUM, offsetof(starter_end_t, allow_any), LST_bool }, diff --git a/src/starter/cmp.c b/src/starter/cmp.c index 724dc7804..aaba7b11d 100644 --- a/src/starter/cmp.c +++ b/src/starter/cmp.c @@ -26,7 +26,6 @@ static bool starter_cmp_end(starter_end_t *c1, starter_end_t *c2) if ((c1 == NULL) || (c2 == NULL)) return FALSE; - VARCMP(has_natip); VARCMP(modecfg); VARCMP(port); VARCMP(protocol); diff --git a/src/starter/confread.c b/src/starter/confread.c index 642fc551b..9199fce18 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -231,11 +231,6 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token, end->host = strdupnull(value); break; case KW_SOURCEIP: - if (end->has_natip) - { - DBG1(DBG_APP, "# natip and sourceip cannot be defined at the same time"); - goto err; - } if (value[0] == '%') { if (streq(value, "%modeconfig") || streq(value, "%modecfg") || @@ -370,27 +365,6 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token, } break; } - case KW_NATIP: - { - host_t *host; - if (end->sourceip) - { - DBG1(DBG_APP, "# natip and sourceip cannot be defined at the same time"); - goto err; - } - host = host_create_from_string(value, 0); - if (!host) - { - DBG1(DBG_APP, "# bad addr: %s=%s", name, value); - goto err; - } - host->destroy(host); - end->sourceip = strdupnull(value); - end->has_natip = TRUE; - conn->mode = MODE_TUNNEL; - conn->proxy_mode = FALSE; - break; - } default: break; } diff --git a/src/starter/confread.h b/src/starter/confread.h index 55022ff65..d01d9c110 100644 --- a/src/starter/confread.h +++ b/src/starter/confread.h @@ -102,7 +102,6 @@ struct starter_end { char *host; u_int ikeport; char *subnet; - bool has_natip; bool modecfg; certpolicy_t sendcert; bool firewall; diff --git a/src/starter/keywords.h b/src/starter/keywords.h index 96609e166..537bceb07 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h @@ -98,7 +98,6 @@ typedef enum { KW_PROTOPORT, KW_SOURCEIP, KW_DNS, - KW_NATIP, KW_FIREWALL, KW_HOSTACCESS, KW_ALLOWANY, @@ -128,7 +127,6 @@ typedef enum { KW_LEFTPROTOPORT, KW_LEFTSOURCEIP, KW_LEFTDNS, - KW_LEFTNATIP, KW_LEFTFIREWALL, KW_LEFTHOSTACCESS, KW_LEFTALLOWANY, @@ -158,7 +156,6 @@ typedef enum { KW_RIGHTPROTOPORT, KW_RIGHTSOURCEIP, KW_RIGHTDNS, - KW_RIGHTNATIP, KW_RIGHTFIREWALL, KW_RIGHTHOSTACCESS, KW_RIGHTALLOWANY, diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index f4d1f477a..8366f5209 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -86,7 +86,6 @@ leftsubnetwithin, KW_LEFTSUBNET leftprotoport, KW_LEFTPROTOPORT leftsourceip, KW_LEFTSOURCEIP leftdns, KW_LEFTDNS -leftnatip, KW_LEFTNATIP leftfirewall, KW_LEFTFIREWALL lefthostaccess, KW_LEFTHOSTACCESS leftallowany, KW_LEFTALLOWANY @@ -111,7 +110,6 @@ rightsubnetwithin, KW_RIGHTSUBNET rightprotoport, KW_RIGHTPROTOPORT rightsourceip, KW_RIGHTSOURCEIP rightdns, KW_RIGHTDNS -rightnatip, KW_RIGHTNATIP rightfirewall, KW_RIGHTFIREWALL righthostaccess, KW_RIGHTHOSTACCESS rightallowany, KW_RIGHTALLOWANY |