diff options
| author | Martin Willi <martin@revosec.ch> | 2011-01-12 15:17:08 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-01-13 10:36:16 +0100 |
| commit | 9bac426bf3b9badf1c39d282e8d49881ffbe3142 (patch) | |
| tree | b4906284ddc0f0ddbad9e3bb9279bdf2f44a54f0 /src/libcharon/plugins/dhcp | |
| parent | 2082417df3ed716ad90507d2d0046c2556c2f54e (diff) | |
| download | strongswan-9bac426bf3b9badf1c39d282e8d49881ffbe3142.tar.bz2 strongswan-9bac426bf3b9badf1c39d282e8d49881ffbe3142.tar.xz | |
Fixed memory cleanup if no DHCP transaction found for an OFFER
Diffstat (limited to 'src/libcharon/plugins/dhcp')
| -rw-r--r-- | src/libcharon/plugins/dhcp/dhcp_socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c index e1e83d648..8851c1b79 100644 --- a/src/libcharon/plugins/dhcp/dhcp_socket.c +++ b/src/libcharon/plugins/dhcp/dhcp_socket.c @@ -459,7 +459,7 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) { dhcp_transaction_t *transaction = NULL; enumerator_t *enumerator; - host_t *offer, *server; + host_t *offer, *server = NULL; offer = host_create_from_chunk(AF_INET, chunk_from_thing(dhcp->your_address), 0); @@ -500,7 +500,7 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) chunk_create((char*)&option->data[pos], 4)); } } - if (option->type == DHCP_SERVER_ID && option->len == 4) + if (!server && option->type == DHCP_SERVER_ID && option->len == 4) { server = host_create_from_chunk(AF_INET, chunk_create(option->data, 4), DHCP_SERVER_PORT); @@ -515,12 +515,11 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen) } DBG1(DBG_CFG, "received DHCP OFFER %H from %H", offer, server); transaction->set_address(transaction, offer->clone(offer)); - transaction->set_server(transaction, server->clone(server)); + transaction->set_server(transaction, server); } this->mutex->unlock(this->mutex); this->condvar->broadcast(this->condvar); offer->destroy(offer); - server->destroy(server); } /** |