http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34440
User: gerald
Date: 2010/10/08 02:36 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r34031 | stig | 2010-08-31 03:24:08 -0700 (Tue, 31 Aug 2010) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-gtp.c
Update the header length after dissecting the header.
This fixes bug 5162.
------------------------------------------------------------------------
r33906 | etxrab | 2010-08-23 23:15:40 -0700 (Mon, 23 Aug 2010) | 3 lines
Changed paths:
M /trunk/capture.c
From Gregor Beck:
ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126
------------------------------------------------------------------------
r34080 | stig | 2010-09-08 06:38:47 -0700 (Wed, 08 Sep 2010) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-ip.c
Revert revision 33780, because the checksum is only calculated
from the header and not the content.
------------------------------------------------------------------------
r34408 | morriss | 2010-10-07 14:10:51 -0700 (Thu, 07 Oct 2010) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-rpc.c
Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r34039 | stig | 2010-09-01 13:54:41 -0700 (Wed, 01 Sep 2010) | 2 lines
Changed paths:
M /trunk/print.c
Ensure we always print the heading when dumping PSML and CSV.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/epan/dissectors/
Changes Path Action
+1 -0 packet-gtp.c Modified
+1 -1 packet-ip.c Modified
+8 -0 packet-rpc.c Modified
Directory: /trunk-1.2/docbook/
Changes Path Action
+17 -15 release-notes.xml Modified
Directory: /trunk-1.2/
Changes Path Action
+4 -3 capture.c Modified
+9 -5 print.c Modified