X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-dhcp%2Fdhcp-client.c;h=68a3b1a1b64c319db8d186091c88530c4c2f1605;hp=c0c348cbf1e6af37f42a4a29dd317782ecfb781f;hb=234fc2dfce0e749f6e88301f2c82a3e54ccaa5fa;hpb=97b9372db178baadb121634fb4ae12bda8969cfe

diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd-dhcp/dhcp-client.c
index c0c348cbf..68a3b1a1b 100644
--- a/src/libsystemd-dhcp/dhcp-client.c
+++ b/src/libsystemd-dhcp/dhcp-client.c
@@ -36,10 +36,10 @@ struct DHCPLease {
         uint32_t t1;
         uint32_t t2;
         uint32_t lifetime;
-        uint32_t address;
-        uint32_t server_address;
-        uint32_t subnet_mask;
-        uint32_t router;
+        be32_t address;
+        be32_t server_address;
+        be32_t subnet_mask;
+        be32_t router;
 };
 
 typedef struct DHCPLease DHCPLease;
@@ -54,7 +54,7 @@ struct sd_dhcp_client {
         sd_event_source *receive_message;
         uint8_t *req_opts;
         size_t req_opts_size;
-        uint32_t last_addr;
+        be32_t last_addr;
         struct ether_addr mac_addr;
         uint32_t xid;
         usec_t start_time;
@@ -382,10 +382,13 @@ static uint16_t client_checksum(void *buf, int len)
 
         if (len & 0x01) {
                 odd = buf;
-                sum += odd[len];
+                sum += odd[len - 1];
         }
 
-        return ~((sum & 0xffff) + (sum >> 16));
+        while (sum >> 16)
+                sum = (sum & 0xffff) + (sum >> 16);
+
+        return ~sum;
 }
 
 static void client_append_ip_headers(DHCPPacket *packet, uint16_t len)
@@ -726,13 +729,20 @@ static int client_receive_ack(sd_dhcp_client *client, DHCPPacket *offer,
 
         lease = new0(DHCPLease, 1);
         if (!lease)
-                return -ENOBUFS;
+                return -ENOMEM;
 
         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;
 
@@ -892,10 +902,10 @@ static int client_receive_raw_message(sd_event_source *s, int fd,
 
                         client_notify(client, DHCP_EVENT_IP_ACQUIRE);
 
-                        close(client->fd);
-                        client->fd = -1;
                         client->receive_message =
                                 sd_event_source_unref(client->receive_message);
+                        close(client->fd);
+                        client->fd = -1;
                 }
 
                 r = 0;