denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed mobike/auth_lifetime in conjunction with p2p-natt

Browse Source
This commit is contained in:
Martin Willi
2007-12-04 10:05:36 +00:00
parent addc4b3ce4
commit b8249ff5ed
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/tasks/ike_auth_lifetime.c
+2 -2
View File
@@ -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) static status_t build_r(private_ike_auth_lifetime_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && 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); add_auth_lifetime(this, message);
return SUCCESS; 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) static status_t process_i(private_ike_auth_lifetime_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && 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); process_payloads(this, message);
return SUCCESS; return SUCCESS;
src/charon/sa/tasks/ike_mobike.c
+4 -4
View File
@@ -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) static status_t build_i(private_ike_mobike_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && 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); message->add_notify(message, FALSE, MOBIKE_SUPPORTED, chunk_empty);
build_address_list(this, message); 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) static status_t process_r(private_ike_mobike_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && if (message->get_exchange_type(message) == IKE_AUTH &&
message->get_payload(message, SECURITY_ASSOCIATION)) message->get_payload(message, ID_INITIATOR))
{ {
process_payloads(this, message); 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) static status_t build_r(private_ike_mobike_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && 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)) 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) static status_t process_i(private_ike_mobike_t *this, message_t *message)
{ {
if (message->get_exchange_type(message) == IKE_AUTH && 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); process_payloads(this, message);
return SUCCESS; return SUCCESS;