http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34416
User: gerald
Date: 2010/10/07 04:53 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34265 | sfisher | 2010-09-27 13:02:54 -0700 (Mon, 27 Sep 2010) | 1 line
Changed paths:
M /trunk/gtk/gui_utils.c
Fix bug #553 by ensuring that the upper-left corner of Wireshark is within the viewable area of the monitor.
------------------------------------------------------------------------
r34267 | stig | 2010-09-27 14:01:54 -0700 (Mon, 27 Sep 2010) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-eigrp.c
Fix the offset errors reported in bug 5261.
------------------------------------------------------------------------
r34280 | rbalint | 2010-09-29 08:46:35 -0700 (Wed, 29 Sep 2010) | 3 lines
Changed paths:
M /trunk/epan/oids.c
Fix the libsmi workaround by adding missing brackets.
From Grzegorz Głowacki <g.glowacki@xxxxxxxx>
------------------------------------------------------------------------
r34282 | guy | 2010-09-29 18:01:25 -0700 (Wed, 29 Sep 2010) | 6 lines
Changed paths:
M /trunk/dumpcap.c
Always use a timeout of 250ms for pipes when not using threads; that way
we know it's < 1s, and don't have to worry about properly setting tv_sec
and tv_usec for select().
Get rid of unneeded pointer variable.
------------------------------------------------------------------------
r34283 | guy | 2010-09-29 18:40:03 -0700 (Wed, 29 Sep 2010) | 6 lines
Changed paths:
M /trunk/dumpcap.c
PIPE_READ_TIMEOUT should be in microseconds, not milliseconds.
As it's a constant, we can do the split into seconds and microseconds at
compile time, so do that (so that it works even if we happen to make
PIPE_READ_TIMEOUT >= 1 second).
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r34216 | stig | 2010-09-23 11:07:49 -0700 (Thu, 23 Sep 2010) | 2 lines
Changed paths:
M /trunk/gtk/menus.c
M /trunk/gtk/new_packet_list.c
Disable sorting while capturing.
------------------------------------------------------------------------
r34234 | stig | 2010-09-24 05:39:15 -0700 (Fri, 24 Sep 2010) | 9 lines
Changed paths:
M /trunk/gtk/menus.c
Disable the "File Set" menu while capturing, because changing file while
capturing causes an assert in cf_reset_state().
We still get this assert if the "List Files" dialog is opened before we start
capture and we change file during capturing. Maybe we have to close this
dialog when starting capture? Or maybe disable all files except the one
being captured to? Then we also may have to update the "Last Modified" and
"Size" columns.
------------------------------------------------------------------------
r34284 | stig | 2010-09-29 23:19:32 -0700 (Wed, 29 Sep 2010) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-ber.c
Constructed octet strings may contain zero encodings.
(X.690 chapter 8.7.3)
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+6 -3 packet-ber.c Modified
+6 -6 packet-eigrp.c Modified
+1 -1 packet-ip.c Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+18 -0 release-notes.xml Modified
Directory: /trunk-1.4/epan/
Changes Path Action
+2 -2 oids.c Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+22 -0 gui_utils.c Modified
+10 -0 menus.c Modified
+3 -0 new_packet_list.c Modified
Directory: /trunk-1.4/
Changes Path Action
+21 -11 dumpcap.c Modified