Wireshark-commits: [Wireshark-commits] rev 52242: / /trunk-1.10/wiretap/: pcapng.c
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=52242
User: guy
Date: 2013/09/28 06:05 PM
Log:
Copy over r52241 from trunk, with manual intervention:
------------------------------------------------------------------------
r52241 | guy | 2013-09-28 11:03:20 -0700 (Sat, 28 Sep 2013) | 12 lines
In a Simple Packet Block, the captured length isn't the block length
minus the lengths of the two length fields and the packet length field,
it's the minimum of that and the packet length, as there might be
padding.
Fixes one problem found by the file in bug 9200.
While we're at it, pcapng_read_packet_block() and
pcapng_read_simple_packet_block() return an integer, not a Boolean;
return 0, not FALSE (they have the same value, but returning 0 makes it
clearer that the return value isn't restricted to TRUE or FALSE).
Directory: /trunk-1.10/wiretap/
Changes Path Action
+5 -3 pcapng.c Modified
