http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49290
User: gerald
Date: 2013/05/14 10:21 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r46905 | guy | 2013-01-02 14:56:24 -0800 (Wed, 02 Jan 2013) | 9 lines
Changed paths:
M /trunk/wiretap/netscreen.c
Update TODO list - the first two items are done, and with stuff added to
support pcap-NG we might have a better way of doing the third item (more
stuff is needed, but that stuff belongs there for pcap-NG, too).
When parsing hex dump lines, skip leading white space, and skip lines
that have nothing but white space, rather than guessing where the hex
dump information ends based on the line length. Parse the hex bytes
manually.
------------------------------------------------------------------------
r48466 | sake | 2013-03-21 15:25:42 -0700 (Thu, 21 Mar 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-tcp.c
Properly set the ISN's when the SYN and SYN/ACK are received out-of-order.
------------------------------------------------------------------------
r48578 | cmaynard | 2013-03-26 20:13:56 -0700 (Tue, 26 Mar 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-sip.c
tvb_reported_length_remaining() can return -1, so be sure to properly handle it if it does.
#BACKPORT(1.6, 1.8)
------------------------------------------------------------------------
r48597 | cmaynard | 2013-03-27 13:44:47 -0700 (Wed, 27 Mar 2013) | 3 lines
Changed paths:
M /trunk/asn1/gsm_map/packet-gsm_map-template.c
M /trunk/epan/dissectors/packet-gsm_map.c
Fix the incorrectly duplicated display filter for hf_gsm_map_dlci.
#BACKPORT(1.6, 1.8)
------------------------------------------------------------------------
r48601 | cmaynard | 2013-03-27 14:41:56 -0700 (Wed, 27 Mar 2013) | 3 lines
Changed paths:
M /trunk/asn1/gsm_map/packet-gsm_map-template.c
M /trunk/epan/dissectors/packet-gsm_map.c
Fix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_type_number.
#BACKPORT(1.6,1.8)
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r46805 | etxrab | 2012-12-27 04:55:05 -0800 (Thu, 27 Dec 2012) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-rpc.c
From Pawel Dziepak:dissect_rpc_array causes assertion fault when array is empty. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8145
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+2 -2 packet-gsm_map.c Modified
+7 -7 packet-rpc.c Modified
+3 -3 packet-sip.c Modified
+7 -1 packet-tcp.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+10 -1 release-notes.xml Modified
Directory: /trunk-1.6/asn1/gsm_map/
Changes Path Action
+2 -2 packet-gsm_map-template.c Modified
Directory: /trunk-1.6/wiretap/
Changes Path Action
+74 -64 netscreen.c Modified