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

- added new job type retransmit_request_job_t

Browse Source 
- fixed memory leaks
This commit is contained in:
Jan Hutter
2005-12-02 13:20:20 +00:00
parent f2d4a4475a
commit 5534ee8476
13 changed files with 439 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/sa/states/ike_sa_init_requested.c
+6 -23
View File
@@ -162,7 +162,6 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t
ike_sa_id_t *ike_sa_id;
iterator_t *payloads;
message_t *request;
packet_t *packet;
status_t status;
/*
@@ -384,34 +383,18 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t
/* build the complete IKE_AUTH request */
this->build_ike_auth_request (this,&request);
/* generate packet */
this->logger->log(this->logger, CONTROL|MOST, "Generate packet from message");
status = request->generate(request, this->ike_sa->get_crypter_initiator(this->ike_sa), this->ike_sa->get_signer_initiator(this->ike_sa), &packet);
/* message can now be sent (must not be destroyed) */
status = this->ike_sa->send_request(this->ike_sa, request);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not generate packet from message");
this->logger->log(this->logger, ERROR, "Could not send request message");
request->destroy(request);
return DELETE_ME;
}
this->logger->log(this->logger, CONTROL|MOST, "Add packet to global send queue");
charon->send_queue->add(charon->send_queue, packet);
/* state can now be changed */
this->logger->log(this->logger, CONTROL|MOST, "Create next state object");
next_state = ike_auth_requested_create(this->ike_sa,this->sent_nonce,this->received_nonce);
/* last messages can now be set */
status = this->ike_sa->set_last_requested_message(this->ike_sa, request);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not set last requested message");
(next_state->state_interface).destroy(&(next_state->state_interface));
request->destroy(request);
return DELETE_ME;
}
/* state can now be changed */
this->ike_sa->set_new_state(this->ike_sa,(state_t *) next_state);
@@ -579,7 +562,7 @@ static void destroy_after_state_change (private_ike_sa_init_requested_t *this)
this->logger->log(this->logger, CONTROL | MOST, "Destroy diffie hellman object");
this->diffie_hellman->destroy(this->diffie_hellman);
this->logger->log(this->logger, CONTROL | MOST, "Destroy shared secret (secrets allready derived)");
allocator_free(this->shared_secret.ptr);
allocator_free_chunk(&(this->shared_secret));
this->logger->log(this->logger, CONTROL | MOST, "Destroy object itself");
allocator_free(this);
}
@@ -598,7 +581,7 @@ static void destroy(private_ike_sa_init_requested_t *this)
this->logger->log(this->logger, CONTROL | MOST, "Destroy received nonce");
allocator_free(this->received_nonce.ptr);
this->logger->log(this->logger, CONTROL | MOST, "Destroy shared secret (secrets allready derived)");
allocator_free(this->shared_secret.ptr);
allocator_free_chunk(&(this->shared_secret));
this->logger->log(this->logger, CONTROL | MOST, "Destroy object itself");
allocator_free(this);
}
Source/charon/sa/states/ike_sa_init_responded.c
+8 -16
View File
@@ -83,7 +83,6 @@ static status_t process_message(private_ike_sa_init_responded_t *this, message_t
sa_payload_t *sa_request;
ts_payload_t *tsi_request, *tsr_request;
message_t *response;
packet_t *response_packet;
exchange_type = request->get_exchange_type(request);
if (exchange_type != IKE_AUTH)
@@ -210,25 +209,18 @@ static status_t process_message(private_ike_sa_init_responded_t *this, message_t
this->logger->log(this->logger, ERROR, "Building tsr payload failed");
response->destroy(response);
return status;
}
/* generate response, get transfroms first */
signer = this->ike_sa->get_signer_responder(this->ike_sa);
crypter = this->ike_sa->get_crypter_responder(this->ike_sa);
status = response->generate(response, crypter, signer, &response_packet);
}
this->logger->log(this->logger, CONTROL | MORE, "IKE_AUTH request successfully handled. Sending reply.");
status = this->ike_sa->send_response(this->ike_sa, response);
/* message can now be sent (must not be destroyed) */
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Error in message generation");
this->logger->log(this->logger, ERROR, "Could not send response message");
response->destroy(response);
return status;
return DELETE_ME;
}
/* send it out */
this->logger->log(this->logger, CONTROL | MORE, "IKE_AUTH request successfully handled. Sending reply.");
charon->send_queue->add(charon->send_queue, response_packet);
/* store for timeout reply */
this->ike_sa->set_last_responded_message(this->ike_sa, response);
/* create new state */
this->ike_sa->set_new_state(this->ike_sa, (state_t*)ike_sa_established_create(this->ike_sa));
Source/charon/sa/states/initiator_init.c
+8 -21
View File
@@ -27,6 +27,7 @@
#include <sa/states/state.h>
#include <sa/states/ike_sa_init_requested.h>
#include <utils/allocator.h>
#include <queues/jobs/retransmit_request_job.h>
#include <transforms/diffie_hellman.h>
#include <encoding/payloads/sa_payload.h>
#include <encoding/payloads/ke_payload.h>
@@ -179,7 +180,6 @@ status_t retry_initiate_connection (private_initiator_init_t *this, int dh_group
init_config_t *init_config;
randomizer_t *randomizer;
message_t *message;
packet_t *packet;
status_t status;
ike_sa_id_t *ike_sa_id;
@@ -201,49 +201,36 @@ status_t retry_initiate_connection (private_initiator_init_t *this, int dh_group
this->logger->log(this->logger, CONTROL|MOST, "Get pseudo random bytes for nonce");
randomizer = this->ike_sa->get_randomizer(this->ike_sa);
allocator_free_chunk(&(this->sent_nonce));
randomizer->allocate_pseudo_random_bytes(randomizer, NONCE_SIZE, &(this->sent_nonce));
this->logger->log(this->logger, RAW|MOST, "Nonce",&(this->sent_nonce));
this->build_ike_sa_init_request (this,&message);
/* generate packet */
this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
status = message->generate(message, NULL, NULL, &packet);
/* message can now be sent (must not be destroyed) */
status = this->ike_sa->send_request(this->ike_sa, message);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not generate packet from message");
this->logger->log(this->logger, ERROR, "Could not send request message");
message->destroy(message);
return DELETE_ME;
}
this->logger->log(this->logger, CONTROL|MOST, "Add packet to global send queue");
charon->send_queue->add(charon->send_queue, packet);
/* state can now be changed */
this->logger->log(this->logger, CONTROL|MOST, "Create next state object");
next_state = ike_sa_init_requested_create(this->ike_sa, this->dh_group_priority, this->diffie_hellman, this->sent_nonce);
/* last message can now be set */
status = this->ike_sa->set_last_requested_message(this->ike_sa, message);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not set last requested message");
(next_state->state_interface).destroy(&(next_state->state_interface));
message->destroy(message);
return DELETE_ME;
}
/* state can now be changed */
this->ike_sa->set_new_state(this->ike_sa,(state_t *) next_state);
/* state has NOW changed :-) */
this->logger->log(this->logger, CONTROL|MORE, "Changed state of IKE_SA from %s to %s", mapping_find(ike_sa_state_m,INITIATOR_INIT),mapping_find(ike_sa_state_m,IKE_SA_INIT_REQUESTED) );
this->logger->log(this->logger, CONTROL|MOST, "Destroy old sate object");
this->destroy_after_state_change(this);
return SUCCESS;
}
Source/charon/sa/states/responder_init.c
+17 -22
View File
@@ -163,7 +163,6 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
iterator_t *payloads;
message_t *response;
host_t *other_host;
packet_t *packet;
host_t *my_host;
status_t status;
@@ -344,36 +343,27 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
this->ike_sa->compute_secrets(this->ike_sa,shared_secret,this->received_nonce, this->sent_nonce);
/* not used anymore */
allocator_free_chunk(&shared_secret);
this->build_ike_sa_init_reply(this,&response);
/* generate packet */
this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");
status = response->generate(response, NULL, NULL, &packet);
/* message can now be sent (must not be destroyed) */
status = this->ike_sa->send_response(this->ike_sa, response);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "could not generate packet from message");
this->logger->log(this->logger, ERROR, "Could not send response message");
response->destroy(response);
return DELETE_ME;
}
this->logger->log(this->logger, CONTROL|MOST, "Add packet to global send queue");
charon->send_queue->add(charon->send_queue, packet);
/* state can now be changed */
this->logger->log(this->logger, CONTROL|MOST, "Create next state object");
next_state = ike_sa_init_responded_create(this->ike_sa);
/* last message can now be set */
status = this->ike_sa->set_last_responded_message(this->ike_sa, response);
if (status != SUCCESS)
{
this->logger->log(this->logger, ERROR, "Could not set last responded message");
response->destroy(response);
(next_state->state_interface).destroy(&(next_state->state_interface));
return DELETE_ME;
}
/* state can now be changed */
this->ike_sa->set_new_state(this->ike_sa, (state_t *) next_state);
/* state has NOW changed :-) */
@@ -517,9 +507,9 @@ static void destroy(private_responder_init_t *this)
this->logger->log(this->logger, CONTROL | MORE, "Going to destroy responder init state object");
this->logger->log(this->logger, CONTROL | MOST, "Destroy sent nonce");
allocator_free(this->sent_nonce.ptr);
allocator_free_chunk(&(this->sent_nonce));
this->logger->log(this->logger, CONTROL | MOST, "Destroy received nonce");
allocator_free(this->received_nonce.ptr);
allocator_free_chunk(&(this->received_nonce));
if (this->diffie_hellman != NULL)
{
@@ -543,6 +533,11 @@ static void destroy_after_state_change (private_responder_init_t *this)
this->logger->log(this->logger, CONTROL | MOST, "Destroy diffie_hellman_t object");
this->diffie_hellman->destroy(this->diffie_hellman);
}
this->logger->log(this->logger, CONTROL | MOST, "Destroy sent nonce");
allocator_free_chunk(&(this->sent_nonce));
this->logger->log(this->logger, CONTROL | MOST, "Destroy received nonce");
allocator_free_chunk(&(this->received_nonce));
this->logger->log(this->logger, CONTROL | MOST, "Destroy object");
allocator_free(this);