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

Accept DHCP replies on bootps port, as we act as a relay agent if server address configured

Browse Source
This commit is contained in:
Martin Willi
2010-04-19 11:18:58 +02:00
parent 6edbe1652b
commit f0212e8837
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/dhcp/dhcp_socket.c
+7 -5
View File
@@ -454,7 +454,6 @@ static void handle_offer(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
chunk_from_thing(dhcp->your_address), 0); chunk_from_thing(dhcp->your_address), 0);
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);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
enumerator = this->discover->create_enumerator(this->discover); enumerator = this->discover->create_enumerator(this->discover);
@@ -462,6 +461,7 @@ static void handle_offer(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 OFFER %H from %H", offer, server);
this->discover->remove_at(this->discover, enumerator); this->discover->remove_at(this->discover, enumerator);
this->request->insert_last(this->request, transaction); this->request->insert_last(this->request, transaction);
transaction->set_address(transaction, offer->clone(offer)); transaction->set_address(transaction, offer->clone(offer));
@@ -515,7 +515,6 @@ static void handle_ack(private_dhcp_socket_t *this, dhcp_t *dhcp, int optlen)
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);
DBG1(DBG_CFG, "received DHCP ACK for %H", offer);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
enumerator = this->request->create_enumerator(this->request); enumerator = this->request->create_enumerator(this->request);
@@ -523,6 +522,7 @@ 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;
@@ -632,13 +632,15 @@ dhcp_socket_t *dhcp_socket_create()
struct sock_filter dhcp_filter_code[] = { struct sock_filter dhcp_filter_code[] = {
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, BPF_STMT(BPF_LD+BPF_B+BPF_ABS,
offsetof(struct iphdr, protocol)), offsetof(struct iphdr, protocol)),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IPPROTO_UDP, 0, 14), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IPPROTO_UDP, 0, 16),
BPF_STMT(BPF_LD+BPF_H+BPF_ABS, sizeof(struct iphdr) + BPF_STMT(BPF_LD+BPF_H+BPF_ABS, sizeof(struct iphdr) +
offsetof(struct udphdr, source)), offsetof(struct udphdr, source)),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, DHCP_SERVER_PORT, 0, 12), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, DHCP_SERVER_PORT, 0, 14),
BPF_STMT(BPF_LD+BPF_H+BPF_ABS, sizeof(struct iphdr) + BPF_STMT(BPF_LD+BPF_H+BPF_ABS, sizeof(struct iphdr) +
offsetof(struct udphdr, dest)), offsetof(struct udphdr, dest)),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, DHCP_CLIENT_PORT, 0, 10), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, DHCP_CLIENT_PORT, 0, 2),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, DHCP_SERVER_PORT, 0, 1),
BPF_JUMP(BPF_JMP+BPF_JA, 0, 0, 10),
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, sizeof(struct iphdr) + BPF_STMT(BPF_LD+BPF_B+BPF_ABS, sizeof(struct iphdr) +
sizeof(struct udphdr) + offsetof(dhcp_t, opcode)), sizeof(struct udphdr) + offsetof(dhcp_t, opcode)),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, BOOTREPLY, 0, 8), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, BOOTREPLY, 0, 8),