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

Merge remote-tracking branch 'origin/master' into topic/icmp6

Browse source 
Conflicts:
	scripts/base/init-bare.bro
	src/Sessions.cc
This commit is contained in:
Daniel Thayer 2012-03-26 17:07:32 -05:00
commit bae6a4178e
52 changed files with 1759 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ICMP.cc
View file

@ -297,10 +297,9 @@ RecordVal* ICMP_Analyzer::ExtractICMP4Context(int len, const u_char*& data)
src_addr = ip_hdr->SrcAddr();
dst_addr = ip_hdr->DstAddr();
uint32 frag_field = ip_hdr->FragField();
DF = ip_hdr->DF();
MF = frag_field & 0x2000;
frag_offset = frag_field & /* IP_OFFMASK not portable */ 0x1fff;
MF = ip_hdr->MF();
frag_offset = ip_hdr->FragOffset();
if ( uint32(len) >= ip_hdr_len + 4 )
proto = GetContextProtocol(ip_hdr, &src_port, &dst_port);