Moved message()-hook invocation to generate_message(), catch pre-generated IKE_SA_INI...

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 8d499cce4246a57b67b9f2ed8a0826e012631f0c..04e3d9ebd26977f8a6aa6585bcf1115cce09448f 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -892,6 +892,7 @@ METHOD(ike_sa_t, generate_message, status_t,
 {
        this->stats[STAT_OUTBOUND] = time_monotonic(NULL);
        message->set_ike_sa_id(message, this->ike_sa_id);
+       charon->bus->message(charon->bus, message, FALSE);
        return message->generate(message,
                                this->keymat->get_aead(this->keymat, FALSE), packet);
 }

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 18703ce36bab67e3c1926c24e6cbc58db832586f..9b403a74158a99a412cca3c8ef4067f83dea3cd5 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -465,7 +465,6 @@ METHOD(task_manager_t, initiate, status_t,
        /* update exchange type if a task changed it */
        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,
                                                                                        &this->initiating.packet);
        if (status != SUCCESS)
@@ -654,7 +653,6 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
        /* message complete, send it */
        DESTROY_IF(this->responding.packet);
        this->responding.packet = NULL;
-       charon->bus->message(charon->bus, message, FALSE);
        status = this->ike_sa->generate_message(this->ike_sa, message,
                                                                                        &this->responding.packet);
        message->destroy(message);