SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsystemd-dhcp: Fix receiving of other message when expecting Ack

Browse Source 
When a DHCP Nak is received, return a DHCP_EVENT_NO_LEASE event. If
some other DHCP message is received or an error happens when parsing
options, return -ENOMSG in order to ignore the packet. There may be
more than one server serving the same subnet, each server will send
its Offer to the client.
This commit is contained in:
Patrik Flykt
2013-12-22 14:28:00 +01:00
committed by Tom Gundersen
parent 2ed0375c2d
commit 77e8d29dd2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-dhcp/dhcp-client.c
+8 -1
View File
@@ -731,8 +731,15 @@ static int client_receive_ack(sd_dhcp_client *client, DHCPPacket *offer,
len = len - DHCP_IP_UDP_SIZE;
r = dhcp_option_parse(&offer->dhcp, len, client_parse_offer, lease);
if (r != DHCP_ACK)
if (r == DHCP_NAK) {
r = DHCP_EVENT_NO_LEASE;
goto error;
}
if (r != DHCP_ACK) {
r = -ENOMSG;
goto error;
}
lease->address = offer->dhcp.yiaddr;