diff options
| author | Martin Willi <martin@revosec.ch> | 2010-07-26 12:05:04 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-07-26 13:53:53 +0200 |
| commit | b2e447e24a95d9df6c5e188ecf92c29ef54a73cc (patch) | |
| tree | 054d186233351734cc92e2806d47cd64c4d7b5c8 | |
| parent | aa334daa9bf3f87b4c8f0565a6f56d67da651316 (diff) | |
| download | strongswan-b2e447e24a95d9df6c5e188ecf92c29ef54a73cc.tar.bz2 strongswan-b2e447e24a95d9df6c5e188ecf92c29ef54a73cc.tar.xz | |
Pass the CREATE_CHILD_SA initiator flag to the child_keys parameter
| -rw-r--r-- | src/libcharon/bus/bus.c | 6 | ||||
| -rw-r--r-- | src/libcharon/bus/bus.h | 5 | ||||
| -rw-r--r-- | src/libcharon/bus/listeners/listener.h | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/ha/ha_child.c | 2 | ||||
| -rw-r--r-- | src/libcharon/sa/tasks/child_create.c | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/libcharon/bus/bus.c b/src/libcharon/bus/bus.c index 97d09c40a..441009e5e 100644 --- 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 df555d83e..6a306afcc 100644 --- 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 45c61c0c0..e7873ee8c 100644 --- 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 5a437c5ac..464353ee1 100644 --- 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 1113e473b..3de27ee3f 100644 --- 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); |