Pass the CREATE_CHILD_SA initiator flag to the child_keys parameter

diff --git a/src/libcharon/bus/bus.c b/src/libcharon/bus/bus.c
index 97d09c40a57589a4850d044e39e996e3b4c74149..441009e5e1c6cc34ff2b8df081ad3a501f4415dd 100644 (file)
--- a/src/libcharon/bus/bus.c
+++ b/src/libcharon/bus/bus.c
@@ -444,8 +444,8 @@ METHOD(bus_t, ike_keys, void,
 }
 
 METHOD(bus_t, child_keys, void,
-       private_bus_t *this, child_sa_t *child_sa, diffie_hellman_t *dh,
-       chunk_t nonce_i, chunk_t nonce_r)
+       private_bus_t *this, child_sa_t *child_sa, bool initiator,
+       diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r)
 {
        enumerator_t *enumerator;
        ike_sa_t *ike_sa;
@@ -464,7 +464,7 @@ METHOD(bus_t, child_keys, void,
                }
                entry->calling++;
                keep = entry->listener->child_keys(entry->listener, ike_sa, child_sa,
-                                                                                  dh, nonce_i, nonce_r);
+                                                                                  initiator, dh, nonce_i, nonce_r);
                entry->calling--;
                if (!keep)
                {

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index df555d83e3f74503ba60a4cb79fa223f98a1b57d..6a306afccd2665ad4357066122756c11c706a58e 100644 (file)
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -268,12 +268,13 @@ struct bus_t {
         * CHILD_SA keymat hook.
         *
         * @param child_sa      CHILD_SA this keymat is used for
+        * @param initiator     initiator of the CREATE_CHILD_SA exchange
         * @param dh            diffie hellman shared secret
         * @param nonce_i       initiators nonce
         * @param nonce_r       responders nonce
         */
-       void (*child_keys)(bus_t *this, child_sa_t *child_sa, diffie_hellman_t *dh,
-                                          chunk_t nonce_i, chunk_t nonce_r);
+       void (*child_keys)(bus_t *this, child_sa_t *child_sa, bool initiator,
+                                          diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r);
 
        /**
         * IKE_SA up/down hook.

diff --git a/src/libcharon/bus/listeners/listener.h b/src/libcharon/bus/listeners/listener.h
index 45c61c0c04de239f4338300222088434b82c7b5a..e7873ee8cebaca1b8bbab9051ce7f97ff4b54cd1 100644 (file)
--- a/src/libcharon/bus/listeners/listener.h
+++ b/src/libcharon/bus/listeners/listener.h
@@ -110,13 +110,15 @@ struct listener_t {
         *
         * @param ike_sa        IKE_SA the child sa belongs to
         * @param child_sa      CHILD_SA this keymat is used for
+        * @param initiator     initiator of the CREATE_CHILD_SA exchange
         * @param dh            diffie hellman shared secret
         * @param nonce_i       initiators nonce
         * @param nonce_r       responders nonce
         * @return                      TRUE to stay registered, FALSE to unregister
         */
        bool (*child_keys)(listener_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
-                                          diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r);
+                                          bool initiator, diffie_hellman_t *dh,
+                                          chunk_t nonce_i, chunk_t nonce_r);
 
        /**
         * Hook called if an IKE_SA gets up or down.

diff --git a/src/libcharon/plugins/ha/ha_child.c b/src/libcharon/plugins/ha/ha_child.c
index 5a437c5ac66201b6ab532e69afeb84e6f3d7e659..464353ee10797a90e3491da9ad294957e43e3e07 100644 (file)
--- a/src/libcharon/plugins/ha/ha_child.c
+++ b/src/libcharon/plugins/ha/ha_child.c
@@ -45,7 +45,7 @@ struct private_ha_child_t {
 
 METHOD(listener_t, child_keys, bool,
        private_ha_child_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
-       diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r)
+       bool initiator, diffie_hellman_t *dh, chunk_t nonce_i, chunk_t nonce_r)
 {
        ha_message_t *m;
        chunk_t secret;

diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c
index 1113e473ba4881216bb688ff58918be4c41791e6..3de27ee3faf19f6173e6a52432ea46e6a51b70ac 100644 (file)
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/tasks/child_create.c
@@ -489,8 +489,8 @@ static status_t select_and_install(private_child_create_t *this,
                return NOT_FOUND;
        }
 
-       charon->bus->child_keys(charon->bus, this->child_sa, this->dh,
-                                                       nonce_i, nonce_r);
+       charon->bus->child_keys(charon->bus, this->child_sa, this->initiator,
+                                                       this->dh, nonce_i, nonce_r);
 
        /* add to IKE_SA, and remove from task */
        this->child_sa->set_state(this->child_sa, CHILD_INSTALLED);