denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed memory cleanup if no DHCP transaction found for an OFFER

Browse Source
This commit is contained in:
Martin Willi
2011-01-13 10:36:16 +01:00
parent 2082417df3
commit 9bac426bf3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/dhcp/dhcp_socket.c
+3 -4
View File
@@ -459,7 +459,7 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
{ {
dhcp_transaction_t *transaction = NULL; dhcp_transaction_t *transaction = NULL;
enumerator_t *enumerator; enumerator_t *enumerator;
host_t *offer, *server; host_t *offer, *server = NULL;
offer = host_create_from_chunk(AF_INET, offer = host_create_from_chunk(AF_INET,
chunk_from_thing(dhcp->your_address), 0); 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)); 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, server = host_create_from_chunk(AF_INET,
chunk_create(option->data, 4), DHCP_SERVER_PORT); 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); DBG1(DBG_CFG, "received DHCP OFFER %H from %H", offer, server);
transaction->set_address(transaction, offer->clone(offer)); 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->mutex->unlock(this->mutex);
this->condvar->broadcast(this->condvar); this->condvar->broadcast(this->condvar);
offer->destroy(offer); offer->destroy(offer);
server->destroy(server);
} }
/** /**