http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38871
User: gerald
Date: 2011/09/02 03:11 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r38303 | cmaynard | 2011-08-01 18:54:03 -0700 (Mon, 01 Aug 2011) | 4 lines
Changed paths:
M /trunk/AUTHORS
M /trunk/asn1/snmp/packet-snmp-template.c
From Paul Stath via bug 5731: The check for engineID length should only occur if the engineID has a non-zero length.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731
------------------------------------------------------------------------
r38304 | etxrab | 2011-08-01 21:17:45 -0700 (Mon, 01 Aug 2011) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-snmp.c
Gnenerate the dissector for previous commit.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r38326 | gerald | 2011-08-03 12:11:07 -0700 (Wed, 03 Aug 2011) | 15 lines
Changed paths:
M /trunk/epan/dissectors/packet-tcp.c
From Dirk Jagdmann via bug 6194:
The attachted patch fixes and enhances the SCPS TCP option dissection. Changes
are:
- fix order of reserved Bit 1,2,3
- fix minimum TCP option length
- fix proto items
- add proto item for Connection ID
- removed the verify_scps() function. It's logic was broken, because it did
reset the scps_capable flag on both flows if one of them did not have it.
However sometimes that flag is only enabled in one flow direction and that flow
direction could see TCP options later on, which would get dissected as invalid.
See the attachted capture file for an example.
------------------------------------------------------------------------
r38399 | cmaynard | 2011-08-07 13:50:31 -0700 (Sun, 07 Aug 2011) | 3 lines
Changed paths:
M /trunk/asn1/h225/h225.cnf
M /trunk/epan/dissectors/packet-h225.c
Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848";, which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287). Regenerate the packet-h225.c dissector. Patch from ericn1234@xxxxxxxxx.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+57 -53 packet-h225.c Modified
+1 -1 packet-snmp.c Modified
+53 -68 packet-tcp.c Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+19 -0 release-notes.xml Modified
Directory: /trunk-1.4/asn1/h225/
Changes Path Action
+4 -0 h225.cnf Modified
Directory: /trunk-1.4/asn1/snmp/
Changes Path Action
+1 -1 packet-snmp-template.c Modified
Directory: /trunk-1.4/
Changes Path Action
+1 -0 AUTHORS Modified