http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38901
User: gerald
Date: 2011/09/06 10:14 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r38419 | cmaynard | 2011-08-08 13:34:18 -0700 (Mon, 08 Aug 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-sflow.c
From Andrew Feren via bug 6219: Offset calculated incorrectly for sFlow extended data.
------------------------------------------------------------------------
r38444 | stig | 2011-08-10 00:39:18 -0700 (Wed, 10 Aug 2011) | 4 lines
Changed paths:
M /trunk/gtk/filter_autocomplete.c
Apply filter if pressing enter when having a auto completion window
and nothing is selected.
This fixes bug 6228.
------------------------------------------------------------------------
r38445 | stig | 2011-08-10 01:00:01 -0700 (Wed, 10 Aug 2011) | 1 line
Changed paths:
M /trunk/gtk/filter_autocomplete.c
Simplified previous enter-fix.
------------------------------------------------------------------------
r38491 | morriss | 2011-08-11 14:42:37 -0700 (Thu, 11 Aug 2011) | 13 lines
Changed paths:
M /trunk/wiretap/pcapng.c
From Hanspeter via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6229 :
If an EnhancedPacketBlock in a pcapng file contains a comment option the
content isn't displayed. Instead "Malformed packet" is displayed with the
reason Exception occurred.
The reason for the problem is a bug in the pcapng.c, where for enhanced packet
blocks, interface description blocks and interface statistics blocks the wrong
union members are used to set the comment. This way required fields in the
structures are overwritten.
The attached patch solves the problem.
------------------------------------------------------------------------
r38542 | etxrab | 2011-08-14 21:39:30 -0700 (Sun, 14 Aug 2011) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-gsm_a_rr.c
From Jeremy Quirke:
misdecoding 3G Neighbour Cell Information Element in SI2quater message due to a coding typo
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6237
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r38561 | morriss | 2011-08-16 06:16:33 -0700 (Tue, 16 Aug 2011) | 5 lines
Changed paths:
M /trunk/asn1/tetra/packet-tetra-template.c
M /trunk/epan/dissectors/packet-dcom.c
M /trunk/epan/dissectors/packet-fix.h
M /trunk/epan/dissectors/packet-giop.c
M /trunk/epan/dissectors/packet-gvcp.c
M /trunk/epan/dissectors/packet-lldp.c
M /trunk/epan/dissectors/packet-olsr.c
M /trunk/epan/dissectors/packet-ospf.c
M /trunk/epan/dissectors/packet-pdcp-lte.c
M /trunk/epan/dissectors/packet-ppp.c
M /trunk/epan/dissectors/packet-rohc.c
M /trunk/epan/dissectors/packet-tetra.c
M /trunk/fix/FIX.xml
M /trunk/fix/FIX42.xml
M /trunk/fix/FIX43.xml
M /trunk/fix/FIX44.xml
M /trunk/wiretap/README.airmagnet
Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :
Fix typo: s/unkown/unknown/
------------------------------------------------------------------------
r38565 | guy | 2011-08-16 09:26:50 -0700 (Tue, 16 Aug 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/dcerpc/drsuapi/drsuapi.idl
M /trunk/epan/dissectors/packet-bgp.c
M /trunk/epan/dissectors/packet-dcerpc-drsuapi.c
M /trunk/epan/dissectors/packet-dcerpc-drsuapi.h
M /trunk/epan/dissectors/packet-homeplug-av.c
M /trunk/epan/dissectors/packet-ppi-sensor.c
M /trunk/epan/dissectors/packet-sita.c
More misspellings of "unknown", for bug 6244.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+1 -1 packet-bgp.c Modified
+1 -1 packet-dcerpc-drsuapi.c Modified
+1 -1 packet-dcerpc-drsuapi.h Modified
+2 -2 packet-dcom.c Modified
+1 -1 packet-fix.h Modified
+1 -1 packet-giop.c Modified
+1 -1 packet-gsm_a_rr.c Modified
+1 -1 packet-gvcp.c Modified
+1 -1 packet-lldp.c Modified
+1 -1 packet-olsr.c Modified
+1 -1 packet-ospf.c Modified
(13 files not shown)