http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50870
User: gerald
Date: 2013/07/24 10:47 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r50423 | eapache | 2013-07-06 14:55:10 -0700 (Sat, 06 Jul 2013) | 5 lines
Changed paths:
M /trunk/ui/cli/tap-iostat.c
From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8888
We're allocating an array of pointers, not an array of objects, so make the
sizeof() reflect that to avoid over-allocating.
------------------------------------------------------------------------
r50510 | cmaynard | 2013-07-11 08:55:52 -0700 (Thu, 11 Jul 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-slsk.c
Fix an obvious case of incorrectly comparing the return value of tvb_length_remaining() against non-zero instead of greater than zero. There are other questionable uses of tvb_length_remaining() as well ... and maybe these should all be replaced with tvb_reported_length_remaining() as well?
#BACKPORT(1.10,1.8)
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r50313 | mmann | 2013-07-02 09:02:31 -0700 (Tue, 02 Jul 2013) | 1 line
Changed paths:
M /trunk/epan/expert.c
Cache the malformed filter instead of looking it up each time a malformed packet comes in. This drastically speeds up the load time of captures with lots of malformed packets (ie fuzztesting).
------------------------------------------------------------------------
r50465 | cmaynard | 2013-07-09 09:44:47 -0700 (Tue, 09 Jul 2013) | 4 lines
Changed paths:
M /trunk/ui/gtk/io_stat.c
Remove the advanced filter field arbitrary text limit of 100 and remove the filter field arbitrary text limit of 256.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8909
#BACKPORT(1.10,1.8)
------------------------------------------------------------------------
r50469 | cmaynard | 2013-07-09 11:01:44 -0700 (Tue, 09 Jul 2013) | 3 lines
Changed paths:
M /trunk/ui/gtk/io_stat.c
Another change that should have been part of r50465, which removed the limits to the number of characters in the display filter(s). [Technically, there is still the inherent 65535 limit.]
#BACKPORT(1.10,1.8)
------------------------------------------------------------------------
r50480 | etxrab | 2013-07-09 22:00:43 -0700 (Tue, 09 Jul 2013) | 6 lines
Changed paths:
M /trunk/ui/cli/tap-sipstat.c
From Joe McEachern:
SIP stats shows incorrect values for Max/Ave setup times.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8897
BACKPORT 1.8 1.10
------------------------------------------------------------------------
r50483 | stig | 2013-07-10 09:33:30 -0700 (Wed, 10 Jul 2013) | 4 lines
Changed paths:
M /trunk/epan/wslua/wslua_proto.c
Use luaL_optnumber for ProtoField mask, to avoid a signed cast.
This fixes bug 5734.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.8/ui/cli/
Changes Path Action
+1 -1 tap-iostat.c Modified
+1 -1 tap-sipstat.c Modified
Directory: /trunk-1.8/epan/dissectors/
Changes Path Action
+2 -1 packet-slsk.c Modified
Directory: /trunk-1.8/docbook/
Changes Path Action
+26 -1 release-notes.xml Modified
Directory: /trunk-1.8/epan/
Changes Path Action
+4 -1 expert.c Modified
Directory: /trunk-1.8/ui/gtk/
Changes Path Action
+14 -13 io_stat.c Modified
Directory: /trunk-1.8/epan/wslua/
Changes Path Action
+3 -3 wslua_proto.c Modified