extended tcp checksum function to strings with an odd number of bytes

This commit is contained in:
cozis
2023-05-18 00:51:13 +02:00
parent 4de61f7cc7
commit 2a8741afe4
+13 -1
View File
@@ -1,5 +1,6 @@
#include <string.h>
#include <stdbool.h>
#include <stdalign.h>
#include "endian.h"
#include "tcp.h"
@@ -125,7 +126,6 @@ calculate_checksum(const slice_list_t *slices, size_t num_slices)
for (size_t slice_idx = 0; slice_idx < num_slices; slice_idx++) {
assert((slices[slice_idx].len & 1) == 0);
const uint16_t *src = slices[slice_idx].src;
const size_t len = slices[slice_idx].len;
@@ -134,6 +134,18 @@ calculate_checksum(const slice_list_t *slices, size_t num_slices)
if (sum > 0xffff)
sum -= 0xffff;
}
if (len & 1) {
alignas(uint16_t) uint8_t temp[2];
temp[0] = ((uint8_t*) slices[slice_idx].src)[len-1];
temp[1] = 0;
uint16_t temp2 = *(uint16_t*) temp;
sum += net_to_cpu_u16(temp2);
if (sum > 0xffff)
sum -= 0xffff;
}
}
return cpu_to_net_u16(~sum);