diff options
| author | Ondřej Caletka <ondrej@caletka.cz> | 2014-06-23 10:45:49 +0200 |
|---|---|---|
| committer | Ondřej Caletka <ondrej@caletka.cz> | 2014-06-23 15:47:29 +0200 |
| commit | 8a90bbadd7e11444713da51827a93600e8355f1b (patch) | |
| tree | e58ad66b275b322e74ae9a3f595d3302b078fef6 /ipv6 | |
| parent | ee7a6cd35b748a278da3e1b407800927c11814c3 (diff) | |
tayga: fix broken ICMP checksum on big-endian machines
This patches fixes wrong ICMP checksum of translated packets on
big-endian machines #16715
The patch is authored by upstream author
Nathan Lutchansky <lutchann@litech.org>
Source of the patch: http://forum.mikrotik.com/viewtopic.php?f=15&t=82329
Signed-off-by: Ondrej Caletka <ondrej@caletka.cz>
Diffstat (limited to 'ipv6')
| -rw-r--r-- | ipv6/tayga/patches/002-bigendian_wrong_checksum.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/ipv6/tayga/patches/002-bigendian_wrong_checksum.patch b/ipv6/tayga/patches/002-bigendian_wrong_checksum.patch new file mode 100644 index 000000000..d8deac3a2 --- /dev/null +++ b/ipv6/tayga/patches/002-bigendian_wrong_checksum.patch @@ -0,0 +1,53 @@ +--- a/nat64.c ++++ b/nat64.c +@@ -19,6 +19,11 @@ + + extern struct config *gcfg; + ++static uint16_t checksum_extend_byte(uint8_t b) ++{ ++ return htons(b << 8); ++} ++ + static uint16_t ip_checksum(void *d, int c) + { + uint32_t sum = 0xffff; +@@ -30,7 +35,7 @@ static uint16_t ip_checksum(void *d, int + } + + if (c) +- sum += htons(*((uint8_t *)p) << 8); ++ sum += checksum_extend_byte(*((uint8_t *)p)); + + while (sum > 0xffff) + sum = (sum & 0xffff) + (sum >> 16); +@@ -180,10 +185,12 @@ static int xlate_payload_4to6(struct pkt + cksum = ones_add(p->icmp->cksum, cksum); + if (p->icmp->type == 8) { + p->icmp->type = 128; +- p->icmp->cksum = ones_add(cksum, ~(128 - 8)); ++ p->icmp->cksum = ones_add(cksum, ++ ~checksum_extend_byte(128 - 8)); + } else { + p->icmp->type = 129; +- p->icmp->cksum = ones_add(cksum, ~(129 - 0)); ++ p->icmp->cksum = ones_add(cksum, ++ ~checksum_extend_byte(129 - 0)); + } + return 0; + case 17: +@@ -668,10 +675,12 @@ static int xlate_payload_6to4(struct pkt + cksum = ones_add(p->icmp->cksum, cksum); + if (p->icmp->type == 128) { + p->icmp->type = 8; +- p->icmp->cksum = ones_add(cksum, 128 - 8); ++ p->icmp->cksum = ones_add(cksum, ++ checksum_extend_byte(128 - 8)); + } else { + p->icmp->type = 0; +- p->icmp->cksum = ones_add(cksum, 129 - 0); ++ p->icmp->cksum = ones_add(cksum, ++ checksum_extend_byte(129 - 0)); + } + return 0; + case 17: |