diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2009-06-23 10:51:58 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2009-06-23 10:51:58 +0000 |
| commit | 4ef45ba0404dac3773e83af995a5ec584b23d633 (patch) | |
| tree | cdd1801c21adf6f2e210ed31c39790ebe95892b7 /src/charon | |
| parent | a33d6529e9bbf1e1afd7b2e8e44e0710987ff645 (diff) | |
| download | vyos-strongswan-4ef45ba0404dac3773e83af995a5ec584b23d633.tar.gz vyos-strongswan-4ef45ba0404dac3773e83af995a5ec584b23d633.zip | |
- Updated translations.
- Import NMU patches.
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/sa/ike_sa.c | 5 | ||||
| -rw-r--r-- | src/charon/sa/tasks/child_create.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c index 6acbc6eef..bebd74160 100644 --- a/src/charon/sa/ike_sa.c +++ b/src/charon/sa/ike_sa.c @@ -1438,6 +1438,11 @@ static status_t process_message(private_ike_sa_t *this, message_t *message) exchange_type_names, message->get_exchange_type(message), message->get_request(message) ? "request" : "response", message->get_message_id(message)); + + if (this->state == IKE_CREATED) + { /* invalid initiation attempt, close SA */ + return DESTROY_ME; + } return status; } else diff --git a/src/charon/sa/tasks/child_create.c b/src/charon/sa/tasks/child_create.c index f6043979f..c07cd37b8 100644 --- a/src/charon/sa/tasks/child_create.c +++ b/src/charon/sa/tasks/child_create.c @@ -1137,11 +1137,11 @@ static void destroy(private_child_create_t *this) { chunk_free(&this->my_nonce); chunk_free(&this->other_nonce); - if (this->tsi) + if (this->tsr) { this->tsr->destroy_offset(this->tsr, offsetof(traffic_selector_t, destroy)); } - if (this->tsr) + if (this->tsi) { this->tsi->destroy_offset(this->tsi, offsetof(traffic_selector_t, destroy)); } |