18e04269fb
Sean Bright <sean.bright@gmail.com>:
...
In r37159, the following change was made to ui/gtk/rtp_player.c:
@@ -1654,9 +1636,7 @@
GtkWidget *dialog;
/* we should never be here if we are in PLAY and !PAUSE */
- if(!rtp_channels->stop&& !rtp_channels->pause){
- exit(10);
- }
+ g_assert(!rtp_channels->stop&& !rtp_channels->pause);
The logic, however, was not negated properly. The correct assertion should be:
g_assert(rtp_channels->stop || rtp_channels->pause);
With the current code, the RTP player causes a crash for me when pressing the
'Play' button.
svn path=/trunk/; revision=40951
2012-02-10 07:16:27 +00:00
4e1637e67c
Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h.
...
svn path=/trunk/; revision=40950
2012-02-10 05:05:17 +00:00
e3fdb92a67
Since the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits, so its type needs to be changed from an FT_UINT8 to an FT_UINT16. This should avoid the crash experienced by Lanell Allen as reported on -dev: http://article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash).
...
svn path=/trunk/; revision=40949
2012-02-10 03:37:28 +00:00
eaba461f2a
Make proper use of esg_tree.
...
svn path=/trunk/; revision=40948
2012-02-10 03:30:28 +00:00
7be6e75c13
Add pcapng variables to wtap_pkthdr.
...
svn path=/trunk/; revision=40947
2012-02-09 22:24:00 +00:00
05a76ae7fa
From David Wei:
...
Add a preference to not dissect containers,
svn path=/trunk/; revision=40946
2012-02-09 22:17:42 +00:00
77c24abcdd
Add comments about new IEs
...
svn path=/trunk/; revision=40945
2012-02-09 22:14:58 +00:00
976b9abea0
From Sean Bright via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815 :
...
Don't use tvb_get_ptr() to retrieve a string being sent into
proto_tree_add_string_format(): use tvb_get_ephemeral_string() instead.
svn path=/trunk/; revision=40944
2012-02-09 19:17:28 +00:00
bc57b2c8b4
From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6819 :
...
Patch to fix channelproperty Maintanance decode.
svn path=/trunk/; revision=40943
2012-02-09 19:02:28 +00:00
89a7d29852
Eliminate a C++/C99-style comment.
...
svn path=/trunk/; revision=40942
2012-02-09 18:59:16 +00:00
5de89fbb74
Add tvb_ip_to_str and tvb_ip6_to_str to the Dev Guide
...
svn path=/trunk/; revision=40941
2012-02-09 17:41:22 +00:00
90b1095f3e
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40940
2012-02-09 17:35:05 +00:00
5da72b4d78
From Steve Magnani:
...
USB: Endpoint bmAttributes not decoded correctly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6814
svn path=/trunk/; revision=40939
2012-02-08 20:21:44 +00:00
b8bbfcf379
Write address resolution block.
...
svn path=/trunk/; revision=40938
2012-02-08 20:15:59 +00:00
b7c03d8235
From a.piesk:
...
no menu item Fle->Export->SSL Session Keys in GTK
Ported to 1.7 by me.
#BACKPORT
Use the patch in the bug report.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813
svn path=/trunk/; revision=40937
2012-02-08 19:56:48 +00:00
5a31396741
From Harald Welte:
...
GSMTAP: add new GPRS/EGPRS RLC related sub-types
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6812
svn path=/trunk/; revision=40936
2012-02-08 19:38:58 +00:00
0c341b3d1c
From Harald Welte:
...
GSMTAP: whitespace / indent cleanup
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6811
svn path=/trunk/; revision=40935
2012-02-08 19:34:53 +00:00
4a2699a2ef
From Harald Welte:
...
GSMTAP dissector: introduce a dissector table.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6810
svn path=/trunk/; revision=40934
2012-02-08 19:31:23 +00:00
b28fe4d079
When building QtShark on Windows: Don't (re)compile Wireshark .c files
...
svn path=/trunk/; revision=40933
2012-02-08 18:51:01 +00:00
c324f2e3e6
From Sylvain Munaut:
...
Fix the windows build by filling up stuct with dummy member
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6798
svn path=/trunk/; revision=40932
2012-02-08 17:01:09 +00:00
af901885b7
Fix set-but-not-used warnings turned errors.
...
svn path=/trunk/; revision=40931
2012-02-08 14:57:16 +00:00
e8ff75961f
As suggested by Joerg on the -dev list yesterday: count up the number of
...
proto_tree_add_text() calls and compare that to the number of
proto_tree_add_<something else>() calls and complain if more than 50%
of the calls are add_text()'s.
proto_tree_add_text() calls whose returned proto_item is used are not counted
as hanging a subtree off a text item is an appropriate use for text items.
I chose 50% because even at that level there are many dissectors with "too many"
proto_tree_add_text()'s.
The function to do all of this is commented out for now for the same reason
plus the fact that it's pretty slow.
svn path=/trunk/; revision=40930
2012-02-08 14:15:01 +00:00
6a33236a0d
Fixed bug with calculation of bytes in flight.
...
A corner case was posted to the Q&A site showing incorrect calculation of bytes in flight (http://ask.wireshark.org/questions/8843/bytes-in-flight-problems-with-retransmissions )
The capture in question has a tcp segment (frame 12) that is a retransmission of unacked earlier data (frames 4, 9, 10) and also contains some new data. Eventually an ACK is received for the earlier segments (frame 16) but the code doesn't remove frame 12 from the linked list of unacked segments because it extends past the received ACK. When more data is received in frame 17, the bytes in flight is calculated from the start of frame 12 rather than from the unacked portion of it, leading to a larger incorrect value.
The change simply updates the starting sequence number in the unacked segment list for any partially acked segment to be the start of unacked data.
The capture in question now shows correct information for bytes in flight, and hopefully the nature of the change won't cause issues elsewhere.
svn path=/trunk/; revision=40929
2012-02-08 11:52:35 +00:00
ca86948d72
Fix reporting of duplicate IP addresses by creating a hash table of
...
results when first visited.
svn path=/trunk/; revision=40928
2012-02-08 11:48:02 +00:00
dcc82dd2bf
Disable the File->Merge... menu item if we cannot save-as,
...
because this will assert.
svn path=/trunk/; revision=40927
2012-02-08 11:16:30 +00:00
ca543968ae
Small whitespace fix.
...
svn path=/trunk/; revision=40926
2012-02-08 07:43:33 +00:00
4e8aa4f6f3
Last fix to the wrong approach.
...
svn path=/trunk/; revision=40925
2012-02-08 07:39:51 +00:00
a15b813eb1
From Sylvain Munaut:
...
Add support for GMR-1 BCCH dissection.
I #if 0'd out incomplete code.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6798
svn path=/trunk/; revision=40924
2012-02-08 07:26:05 +00:00
2d3220dcb5
Heuristic standard detection:
...
- Grab optional parameters for LUDT/LUDTS
- Fix processing of the 2-octet pointers
svn path=/trunk/; revision=40923
2012-02-08 03:18:04 +00:00
d51510c1a3
From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :
...
Remove some duplicate checks.
svn path=/trunk/; revision=40922
2012-02-07 19:14:45 +00:00
4f23aa0f05
Initialize felica_tree to NULL to avoid a false warning.
...
svn path=/trunk/; revision=40921
2012-02-07 17:36:08 +00:00
77e48cb488
Make some minimally required changes as pointed out in bug6758[1].
...
In addition:
-> I didn't think using tvb_new_subset_remaining() in order to iterate through the blocks was the best way to implement this, so I changed it to the method I had proposed earlier[2].
-> Some whitespace cleanup.
-> Noted some "TODO"'s for potential further improvements.
[1]: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6758#c9
[2]: http://article.gmane.org/gmane.network.wireshark.devel/24721
svn path=/trunk/; revision=40920
2012-02-07 17:01:01 +00:00
76efc975bd
Fix the fuzz failure reported in in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6799 :
...
Ensure that the payload length handed to the reassembly routines doesn't go
negative/very-large-positive.
svn path=/trunk/; revision=40919
2012-02-07 16:53:22 +00:00
8eea660237
small whitespace fix
...
svn path=/trunk/; revision=40918
2012-02-07 14:01:24 +00:00
7c166c9c4e
Initiliase another variable.
...
svn path=/trunk/; revision=40917
2012-02-07 11:15:22 +00:00
203d9589f3
Initialise a variable to avoid warning.
...
svn path=/trunk/; revision=40916
2012-02-07 11:12:17 +00:00
d69fe726b9
packet-gsm_sim.c was the wrong file to check in.
...
I meant ui/gtk/voip_calls_dlg.c.
svn path=/trunk/; revision=40915
2012-02-07 09:06:44 +00:00
dca8952441
Fix "variable set but not used" warnings turned error. In at least
...
one case this looks like a logic bug and should be investigated.
svn path=/trunk/; revision=40914
2012-02-07 09:03:14 +00:00
dc1a9e539b
Make sure that we only have to set (or pick up) the docdir environment
...
variable on the initial cmake run and not on later re-runs (like when some
cmakelists.txt file changed and we call make).
Of course this value should really be passed as an option instead of an
environment variable but I want to document how to get the current approach
working properly before switching to the proper approach.
svn path=/trunk/; revision=40913
2012-02-07 08:05:11 +00:00
b84f2921ac
Allways use g_list_prepend().
...
svn path=/trunk/; revision=40912
2012-02-07 06:56:45 +00:00
692528e2a5
Update the documentation to match the sort order. This documentation error was pointed out by Markus Amend on -users.
...
Reference: http://article.gmane.org/gmane.network.wireshark.user/14477
(BTW, I quickly scanned through tap-iousers.c:iousers_draw() and the sorting seems to be very inefficient.)
svn path=/trunk/; revision=40911
2012-02-07 03:20:33 +00:00
ef218f0735
Export the mtp3_heuristic_standard preference and mtp3_standard_vals[].
...
Set mtp3_standard back to the preference value after each packet (in addition
to in the frame-end function) in case there are multiple packets of different
standards in the same frame.
svn path=/trunk/; revision=40910
2012-02-07 02:19:11 +00:00
64b511f5e7
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40909
2012-02-06 22:20:29 +00:00
50fe66d265
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40908
2012-02-06 22:19:07 +00:00
7424e362c6
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40907
2012-02-06 22:18:45 +00:00
0625d95778
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40906
2012-02-06 22:16:52 +00:00
cbd273a05d
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40905
2012-02-06 22:16:22 +00:00
b8502c9013
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40904
2012-02-06 22:15:53 +00:00
846fe21e31
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40903
2012-02-06 22:15:24 +00:00
d2e40e2d4a
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
...
svn path=/trunk/; revision=40902
2012-02-06 22:14:30 +00:00
Jörg Mayer