From: Martin Willi <martin@strongswan.org>
Date: Tue, 4 Dec 2007 10:05:36 +0000 (-0000)
Subject: fixed mobike/auth_lifetime in conjunction with p2p-natt
X-Git-Tag: 4.1.9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8249ff5edde1607217efe189310eb820499e981;p=thirdparty%2Fstrongswan.git

fixed mobike/auth_lifetime in conjunction with p2p-natt
---

diff --git a/src/charon/sa/tasks/ike_auth_lifetime.c b/src/charon/sa/tasks/ike_auth_lifetime.c
index 8820afd6b6..9d37ec6088 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 d1fc8c695c..a53c243f0a 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;