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

dhcp: Move log messages for received packets

Browse Source 
This way they are logged in the context of the corresponding IKE_SA.

Closes strongswan/strongswan#417.
This commit is contained in:
Tobias Brunner
2021-06-08 17:03:17 +02:00
parent 4e29d6fac1
commit ae71f8357d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/dhcp/dhcp_socket.c
+5 -7
View File
@@ -418,6 +418,9 @@ METHOD(dhcp_socket_t, enroll, dhcp_transaction_t*,
DBG1(DBG_CFG, "DHCP DISCOVER timed out"); DBG1(DBG_CFG, "DHCP DISCOVER timed out");
return NULL; return NULL;
} }
DBG1(DBG_CFG, "received DHCP OFFER %H from %H",
transaction->get_address(transaction),
transaction->get_server(transaction));
try = 1; try = 1;
while (try <= DHCP_TRIES && request(this, transaction)) while (try <= DHCP_TRIES && request(this, transaction))
@@ -437,6 +440,8 @@ METHOD(dhcp_socket_t, enroll, dhcp_transaction_t*,
return NULL; return NULL;
} }
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
DBG1(DBG_CFG, "received DHCP ACK for %H",
transaction->get_address(transaction));
return transaction; return transaction;
} }
@@ -550,7 +555,6 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
server = host_create_from_chunk(AF_INET, server = host_create_from_chunk(AF_INET,
chunk_from_thing(dhcp->server_address), DHCP_SERVER_PORT); chunk_from_thing(dhcp->server_address), DHCP_SERVER_PORT);
} }
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); transaction->set_server(transaction, server);
} }
@@ -566,10 +570,6 @@ static void handle_ack(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
{ {
dhcp_transaction_t *transaction; dhcp_transaction_t *transaction;
enumerator_t *enumerator; enumerator_t *enumerator;
host_t *offer;
offer = host_create_from_chunk(AF_INET,
chunk_from_thing(dhcp->your_address), 0);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
enumerator = this->request->create_enumerator(this->request); enumerator = this->request->create_enumerator(this->request);
@@ -577,7 +577,6 @@ static void handle_ack(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
{ {
if (transaction->get_id(transaction) == dhcp->transaction_id) if (transaction->get_id(transaction) == dhcp->transaction_id)
{ {
DBG1(DBG_CFG, "received DHCP ACK for %H", offer);
this->request->remove_at(this->request, enumerator); this->request->remove_at(this->request, enumerator);
this->completed->insert_last(this->completed, transaction); this->completed->insert_last(this->completed, transaction);
break; break;
@@ -586,7 +585,6 @@ static void handle_ack(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
this->condvar->broadcast(this->condvar); this->condvar->broadcast(this->condvar);
offer->destroy(offer);
} }
/** /**