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

Moved message()-hook invocation to generate_message(), catch pre-generated IKE_SA_INITs, too

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:41 +01:00
parent f2986524d9
commit 89fda1abb5
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+1
View File
@@ -892,6 +892,7 @@ METHOD(ike_sa_t, generate_message, status_t,
{ {
this->stats[STAT_OUTBOUND] = time_monotonic(NULL); this->stats[STAT_OUTBOUND] = time_monotonic(NULL);
message->set_ike_sa_id(message, this->ike_sa_id); message->set_ike_sa_id(message, this->ike_sa_id);
charon->bus->message(charon->bus, message, FALSE);
return message->generate(message, return message->generate(message,
this->keymat->get_aead(this->keymat, FALSE), packet); this->keymat->get_aead(this->keymat, FALSE), packet);
} }
src/libcharon/sa/task_manager.c
-2
View File
@@ -465,7 +465,6 @@ METHOD(task_manager_t, initiate, status_t,
/* update exchange type if a task changed it */ /* update exchange type if a task changed it */
this->initiating.type = message->get_exchange_type(message); this->initiating.type = message->get_exchange_type(message);
charon->bus->message(charon->bus, message, FALSE);
status = this->ike_sa->generate_message(this->ike_sa, message, status = this->ike_sa->generate_message(this->ike_sa, message,
&this->initiating.packet); &this->initiating.packet);
if (status != SUCCESS) if (status != SUCCESS)
@@ -654,7 +653,6 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
/* message complete, send it */ /* message complete, send it */
DESTROY_IF(this->responding.packet); DESTROY_IF(this->responding.packet);
this->responding.packet = NULL; this->responding.packet = NULL;
charon->bus->message(charon->bus, message, FALSE);
status = this->ike_sa->generate_message(this->ike_sa, message, status = this->ike_sa->generate_message(this->ike_sa, message,
&this->responding.packet); &this->responding.packet);
message->destroy(message); message->destroy(message);