Home Explore Help
Register Sign In
wareck
/
lede_packages
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: dcc3d482f3
Branches Tags
lede_packages
/
ipv6
/
tayga
/
patches
/
002-bigendian_wrong_checksum.patch

002-bigendian_wrong_checksum.patch 1.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 
  1. --- a/nat64.c
    2. 

  2. +++ b/nat64.c
    3. 

  3. @@ -19,6 +19,11 @@
    4. 

  4.  
    5. 

  5.  extern struct config *gcfg;
    6. 

  6.  
    7. 

  7. +static uint16_t checksum_extend_byte(uint8_t b)
    8. 

  8. +{
    9. 

  9. +	return htons(b << 8);
    10. 

  10. +}
    11. 

  11. +
    12. 

  12.  static uint16_t ip_checksum(void *d, int c)
    13. 

  13.  {
    14. 

  14.  	uint32_t sum = 0xffff;
    15. 

  15. @@ -30,7 +35,7 @@ static uint16_t ip_checksum(void *d, int
    16. 

  16.  	}
    17. 

  17.  
    18. 

  18.  	if (c)
    19. 

  19. -		sum += htons(*((uint8_t *)p) << 8);
    20. 

  20. +		sum += checksum_extend_byte(*((uint8_t *)p));
    21. 

  21.  
    22. 

  22.  	while (sum > 0xffff)
    23. 

  23.  		sum = (sum & 0xffff) + (sum >> 16);
    24. 

  24. @@ -180,10 +185,12 @@ static int xlate_payload_4to6(struct pkt
    25. 

  25.  		cksum = ones_add(p->icmp->cksum, cksum);
    26. 

  26.  		if (p->icmp->type == 8) {
    27. 

  27.  			p->icmp->type = 128;
    28. 

  28. -			p->icmp->cksum = ones_add(cksum, ~(128 - 8));
    29. 

  29. +			p->icmp->cksum = ones_add(cksum,
    30. 

  30. +						~checksum_extend_byte(128 - 8));
    31. 

  31.  		} else {
    32. 

  32.  			p->icmp->type = 129;
    33. 

  33. -			p->icmp->cksum = ones_add(cksum, ~(129 - 0));
    34. 

  34. +			p->icmp->cksum = ones_add(cksum,
    35. 

  35. +						~checksum_extend_byte(129 - 0));
    36. 

  36.  		}
    37. 

  37.  		return 0;
    38. 

  38.  	case 17:
    39. 

  39. @@ -668,10 +675,12 @@ static int xlate_payload_6to4(struct pkt
    40. 

  40.  		cksum = ones_add(p->icmp->cksum, cksum);
    41. 

  41.  		if (p->icmp->type == 128) {
    42. 

  42.  			p->icmp->type = 8;
    43. 

  43. -			p->icmp->cksum = ones_add(cksum, 128 - 8);
    44. 

  44. +			p->icmp->cksum = ones_add(cksum,
    45. 

  45. +						checksum_extend_byte(128 - 8));
    46. 

  46.  		} else {
    47. 

  47.  			p->icmp->type = 0;
    48. 

  48. -			p->icmp->cksum = ones_add(cksum, 129 - 0);
    49. 

  49. +			p->icmp->cksum = ones_add(cksum,
    50. 

  50. +						checksum_extend_byte(129 - 0));
    51. 

  51.  		}
    52. 

  52.  		return 0;
    53. 

  53.  	case 17:
    54.