diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-25 17:00:01 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-25 17:03:00 +0200 |
| commit | 5299719569966cf6a4534f3245843de08b9aa49f (patch) | |
| tree | 0a9dc6522401b775b3f60334d39d2d3a6ad88e00 /src/libcharon/sa/tasks/child_delete.c | |
| parent | e5c6ebb697ef33143559ebc26ca8a606855ab6d0 (diff) | |
| download | strongswan-5299719569966cf6a4534f3245843de08b9aa49f.tar.bz2 strongswan-5299719569966cf6a4534f3245843de08b9aa49f.tar.xz | |
Migrated delete_payload to INIT/METHOD macros, replaced iterator
Diffstat (limited to 'src/libcharon/sa/tasks/child_delete.c')
| -rw-r--r-- | src/libcharon/sa/tasks/child_delete.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libcharon/sa/tasks/child_delete.c b/src/libcharon/sa/tasks/child_delete.c index b0cd30e1e..45e97e4cd 100644 --- a/src/libcharon/sa/tasks/child_delete.c +++ b/src/libcharon/sa/tasks/child_delete.c @@ -117,11 +117,10 @@ static void build_payloads(private_child_delete_t *this, message_t *message) */ static void process_payloads(private_child_delete_t *this, message_t *message) { - enumerator_t *payloads; - iterator_t *spis; + enumerator_t *payloads, *spis; payload_t *payload; delete_payload_t *delete_payload; - u_int32_t *spi; + u_int32_t spi; protocol_id_t protocol; child_sa_t *child_sa; @@ -136,19 +135,19 @@ static void process_payloads(private_child_delete_t *this, message_t *message) { continue; } - spis = delete_payload->create_spi_iterator(delete_payload); - while (spis->iterate(spis, (void**)&spi)) + spis = delete_payload->create_spi_enumerator(delete_payload); + while (spis->enumerate(spis, &spi)) { child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, - *spi, FALSE); + spi, FALSE); if (child_sa == NULL) { DBG1(DBG_IKE, "received DELETE for %N CHILD_SA with SPI %.8x, " - "but no such SA", protocol_id_names, protocol, ntohl(*spi)); + "but no such SA", protocol_id_names, protocol, ntohl(spi)); continue; } DBG1(DBG_IKE, "received DELETE for %N CHILD_SA with SPI %.8x", - protocol_id_names, protocol, ntohl(*spi)); + protocol_id_names, protocol, ntohl(spi)); switch (child_sa->get_state(child_sa)) { @@ -161,7 +160,7 @@ static void process_payloads(private_child_delete_t *this, message_t *message) if (!this->initiator) { this->ike_sa->destroy_child_sa(this->ike_sa, - protocol, *spi); + protocol, spi); continue; } case CHILD_INSTALLED: |