Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/johanna/gcc-6.2.1'

Browse source 
BIT-1732 #merged

* origin/topic/johanna/gcc-6.2.1:
  Fix alignment issue of ones_complement_checksum
This commit is contained in:
Robin Sommer 2016-10-24 11:11:07 -07:00
commit c57f83d8bf
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/net_util.cc
View file

@ -18,13 +18,16 @@
// Returns the ones-complement checksum of a chunk of b short-aligned bytes.
int ones_complement_checksum(const void* p, int b, uint32 sum)
{
const u_short* sp = (u_short*) p; // better be aligned!
const unsigned char* sp = (unsigned char*) p;
b /= 2; // convert to count of short's
/* No need for endian conversions. */
while ( --b >= 0 )
sum += *sp++;
{
sum += *sp + (*(sp+1) << 8);
sp += 2;
}
while ( sum > 0xffff )
sum = (sum & 0xffff) + (sum >> 16);