diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-07-07 05:50:02 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-07-07 05:50:02 +0000 |
| commit | dc33fee770b7b44eadaf0e9a1eabc3ba94b87d7f (patch) | |
| tree | 4424b5bb89bebbb48d02965944a1ec1a0eafb4d4 /src/pluto/keys.c | |
| parent | ad3dab05200bd088aa25c2be8b7db07de2228b0b (diff) | |
| download | strongswan-dc33fee770b7b44eadaf0e9a1eabc3ba94b87d7f.tar.bz2 strongswan-dc33fee770b7b44eadaf0e9a1eabc3ba94b87d7f.tar.xz | |
removed NAT_TRAVERSAL and VIRTUAL_IP compile options
Diffstat (limited to 'src/pluto/keys.c')
| -rw-r--r-- | src/pluto/keys.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/pluto/keys.c b/src/pluto/keys.c index faa3ae38d..106573f33 100644 --- a/src/pluto/keys.c +++ b/src/pluto/keys.c @@ -55,11 +55,6 @@ #include "timer.h" #include "fetch.h" -#ifdef NAT_TRAVERSAL -#define PB_STREAM_UNDEFINED -#include "nat_traversal.h" -#endif - const char *shared_secrets_file = SHARED_SECRETS_FILE; typedef struct id_list id_list_t; @@ -185,19 +180,16 @@ get_secret(const struct connection *c, enum PrivateKeyKind kind, bool asym) happy(anyaddr(addrtypeof(&c->spd.that.host_addr), &rw_id.ip_addr)); his_id = &rw_id; } -#ifdef NAT_TRAVERSAL - else if (nat_traversal_enabled + else if (kind == PPK_PSK && (c->policy & POLICY_PSK) - && kind == PPK_PSK && ((c->kind == CK_TEMPLATE && c->spd.that.id.kind == ID_NONE) || (c->kind == CK_INSTANCE && id_is_ipaddr(&c->spd.that.id)))) { - /* roadwarrior: replace him with 0.0.0.0 */ - rw_id.kind = ID_IPV4_ADDR; - happy(anyaddr(addrtypeof(&c->spd.that.host_addr), &rw_id.ip_addr)); - his_id = &rw_id; + /* roadwarrior: replace him with 0.0.0.0 */ + rw_id.kind = ID_IPV4_ADDR; + happy(anyaddr(addrtypeof(&c->spd.that.host_addr), &rw_id.ip_addr)); + his_id = &rw_id; } -#endif for (s = secrets; s != NULL; s = s->next) { |