libsystemd-dhcp: Fix checksum computation for buffer with odd size

Fix off-by-one error and notice that summing may need more than one
round for the result to be in the lower 16 bits.
This commit is contained in:
Patrik Flykt
2013-12-22 14:28:00 +01:00
committed by Tom Gundersen
parent 77e8d29dd2
commit 0c6a3c888a
2 changed files with 10 additions and 4 deletions
+5 -2
View File
@@ -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)
+5 -2
View File
@@ -102,10 +102,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 test_checksum(void)