http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49292
User: gerald
Date: 2013/05/14 10:52 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r49154 | mmann | 2013-05-03 19:20:59 -0700 (Fri, 03 May 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-lisp-data.c
M /trunk/epan/dissectors/packet-lisp.c
LISP control packet incorrectly identified as LISP data based when UDP source port is 4341. Bug 8627 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8627)
Also did some minor cleanup/improvements while I was there.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r49046 | guy | 2013-04-25 21:42:20 -0700 (Thu, 25 Apr 2013) | 2 lines
Changed paths:
M /trunk/ui/win32/console_win32.c
Work around a bug in a Microsoft security fix.
------------------------------------------------------------------------
r49114 | morriss | 2013-05-01 12:42:28 -0700 (Wed, 01 May 2013) | 6 lines
Changed paths:
M /trunk/epan/dissectors/packet-hsrp.c
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8622 :
hsrp2.md5_auth_data is added to the tree with a length of 16 so declare it as
FT_BYTES instead of FT_UINT32 (using the latter causes an assertion in
trunk-1.8 and an expert info in trunk and trunk-1.10).
------------------------------------------------------------------------
r49128 | mmann | 2013-05-01 16:59:16 -0700 (Wed, 01 May 2013) | 1 line
Changed paths:
M /trunk/asn1/snmp/packet-snmp-template.c
M /trunk/epan/dissectors/packet-snmp.c
Protect a "divide by zero" operation. Bug 7359 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7359). This seems to have been generated through a corrupted UAT file switching between 1.8 and 1.10, but it's a good check to have regardless.
------------------------------------------------------------------------
r49170 | mmann | 2013-05-05 04:02:42 -0700 (Sun, 05 May 2013) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-lisp-data.c
Remove if (tree) so expert_info will always be called.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+5 -5 packet-hsrp.c Modified
+16 -16 packet-lisp-data.c Modified
+3 -0 packet-lisp.c Modified
+10 -2 packet-snmp.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+27 -0 release-notes.xml Modified
Directory: /trunk-1.6/gtk/
Changes Path Action
+20 -0 main.c Modified
Directory: /trunk-1.6/asn1/snmp/
Changes Path Action
+8 -0 packet-snmp-template.c Modified