Merge remote-tracking branch 'origin/topic/jsiwek/bit-348'

Browse source

* origin/topic/jsiwek/bit-348:
  Update SNMP analyzer's DeliverPacket method signature.
  Fix reassembly of data w/ sizes beyond 32-bit capacities (BIT-348).

Conflicts:
	src/analyzer/protocol/file/File.cc
	src/analyzer/protocol/file/File.h

...

This commit is contained in:

Robin Sommer 2014-04-24 18:04:44 -07:00

parent 988ba2e897 04344d09eb

commit 116ed370a2

77 changed files with 1628 additions and 1542 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2234

src/analyzer/protocol/tcp/TCP.cc

View file

File diff suppressed because it is too large Load diff