diff options
| author | Martin Willi <martin@strongswan.org> | 2007-12-04 10:05:36 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-12-04 10:05:36 +0000 |
| commit | b8249ff5edde1607217efe189310eb820499e981 (patch) | |
| tree | 536fda763311c95ef2c7bf48b2c02dd256133245 /src/charon | |
| parent | addc4b3ce4be2909616c9c12a071f7b675d7ea6b (diff) | |
| download | strongswan-b8249ff5edde1607217efe189310eb820499e981.tar.bz2 strongswan-b8249ff5edde1607217efe189310eb820499e981.tar.xz | |
fixed mobike/auth_lifetime in conjunction with p2p-natt
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/sa/tasks/ike_auth_lifetime.c | 4 | ||||
| -rw-r--r-- | src/charon/sa/tasks/ike_mobike.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/charon/sa/tasks/ike_auth_lifetime.c b/src/charon/sa/tasks/ike_auth_lifetime.c index 8820afd6b..9d37ec608 100644 --- a/src/charon/sa/tasks/ike_auth_lifetime.c +++ b/src/charon/sa/tasks/ike_auth_lifetime.c @@ -125,7 +125,7 @@ static status_t process_r(private_ike_auth_lifetime_t *this, message_t *message) static status_t build_r(private_ike_auth_lifetime_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED) { add_auth_lifetime(this, message); return SUCCESS; @@ -139,7 +139,7 @@ static status_t build_r(private_ike_auth_lifetime_t *this, message_t *message) static status_t process_i(private_ike_auth_lifetime_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED) { process_payloads(this, message); return SUCCESS; diff --git a/src/charon/sa/tasks/ike_mobike.c b/src/charon/sa/tasks/ike_mobike.c index d1fc8c695..a53c243f0 100644 --- a/src/charon/sa/tasks/ike_mobike.c +++ b/src/charon/sa/tasks/ike_mobike.c @@ -287,7 +287,7 @@ static void transmit(private_ike_mobike_t *this, packet_t *packet) static status_t build_i(private_ike_mobike_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + message->get_payload(message, ID_INITIATOR)) { message->add_notify(message, FALSE, MOBIKE_SUPPORTED, chunk_empty); build_address_list(this, message); @@ -317,7 +317,7 @@ static status_t build_i(private_ike_mobike_t *this, message_t *message) static status_t process_r(private_ike_mobike_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + message->get_payload(message, ID_INITIATOR)) { process_payloads(this, message); } @@ -348,7 +348,7 @@ static status_t process_r(private_ike_mobike_t *this, message_t *message) static status_t build_r(private_ike_mobike_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED) { if (this->ike_sa->supports_extension(this->ike_sa, EXT_MOBIKE)) { @@ -378,7 +378,7 @@ static status_t build_r(private_ike_mobike_t *this, message_t *message) static status_t process_i(private_ike_mobike_t *this, message_t *message) { if (message->get_exchange_type(message) == IKE_AUTH && - message->get_payload(message, SECURITY_ASSOCIATION)) + this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED) { process_payloads(this, message); return SUCCESS; |