7 years agoFrom Harald Welte:
etxrab [Wed, 8 Feb 2012 19:31:23 +0000 (19:31 +0000)]
From Harald Welte:
GSMTAP dissector: introduce a dissector table.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40934 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWhen building QtShark on Windows: Don't (re)compile Wireshark .c files
wmeier [Wed, 8 Feb 2012 18:51:01 +0000 (18:51 +0000)]
When building QtShark on Windows: Don't (re)compile Wireshark .c files

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40933 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Sylvain Munaut:
etxrab [Wed, 8 Feb 2012 17:01:09 +0000 (17:01 +0000)]
From Sylvain Munaut:
Fix the windows build by filling up stuct with dummy member


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40932 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix set-but-not-used warnings turned errors.
jmayer [Wed, 8 Feb 2012 14:57:16 +0000 (14:57 +0000)]
Fix set-but-not-used warnings turned errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40931 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAs suggested by Joerg on the -dev list yesterday: count up the number of
morriss [Wed, 8 Feb 2012 14:15:01 +0000 (14:15 +0000)]
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"

The function to do all of this is commented out for now for the same reason
plus the fact that it's pretty slow.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40930 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFixed bug with calculation of bytes in flight.
grahamb [Wed, 8 Feb 2012 11:52:35 +0000 (11:52 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40929 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix reporting of duplicate IP addresses by creating a hash table of
martinm [Wed, 8 Feb 2012 11:48:02 +0000 (11:48 +0000)]
Fix reporting of duplicate IP addresses by creating a hash table of
results when first visited.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40928 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDisable the File->Merge... menu item if we cannot save-as,
stig [Wed, 8 Feb 2012 11:16:30 +0000 (11:16 +0000)]
Disable the File->Merge... menu item if we cannot save-as,
because this will assert.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40927 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSmall whitespace fix.
jmayer [Wed, 8 Feb 2012 07:43:33 +0000 (07:43 +0000)]
Small whitespace fix.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40926 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoLast fix to the wrong approach.
jmayer [Wed, 8 Feb 2012 07:39:51 +0000 (07:39 +0000)]
Last fix to the wrong approach.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40925 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Sylvain Munaut:
etxrab [Wed, 8 Feb 2012 07:26:05 +0000 (07:26 +0000)]
From Sylvain Munaut:
Add support for GMR-1 BCCH dissection.

I #if 0'd out incomplete code.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40924 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHeuristic standard detection:
morriss [Wed, 8 Feb 2012 03:18:04 +0000 (03:18 +0000)]
Heuristic standard detection:
 - Grab optional parameters for LUDT/LUDTS
 - Fix processing of the 2-octet pointers

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40923 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :
morriss [Tue, 7 Feb 2012 19:14:45 +0000 (19:14 +0000)]
From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6795 :

Remove some duplicate checks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40922 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInitialize felica_tree to NULL to avoid a false warning.
cmaynard [Tue, 7 Feb 2012 17:36:08 +0000 (17:36 +0000)]
Initialize felica_tree to NULL to avoid a false warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40921 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake some minimally required changes as pointed out in bug6758[1].
cmaynard [Tue, 7 Feb 2012 17:01:01 +0000 (17:01 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40920 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix the fuzz failure reported in in https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Tue, 7 Feb 2012 16:53:22 +0000 (16:53 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40919 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agosmall whitespace fix
jmayer [Tue, 7 Feb 2012 14:01:24 +0000 (14:01 +0000)]
small whitespace fix

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40918 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInitiliase another variable.
martinm [Tue, 7 Feb 2012 11:15:22 +0000 (11:15 +0000)]
Initiliase another variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40917 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoInitialise a variable to avoid warning.
martinm [Tue, 7 Feb 2012 11:12:17 +0000 (11:12 +0000)]
Initialise a variable to avoid warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40916 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agopacket-gsm_sim.c was the wrong file to check in.
jmayer [Tue, 7 Feb 2012 09:06:44 +0000 (09:06 +0000)]
packet-gsm_sim.c was the wrong file to check in.
I meant ui/gtk/voip_calls_dlg.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40915 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix "variable set but not used" warnings turned error. In at least
jmayer [Tue, 7 Feb 2012 09:03:14 +0000 (09:03 +0000)]
Fix "variable set but not used" warnings turned error. In at least
one case this looks like a logic bug and should be investigated.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40914 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake sure that we only have to set (or pick up) the docdir environment
jmayer [Tue, 7 Feb 2012 08:05:11 +0000 (08:05 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40913 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAllways use g_list_prepend().
etxrab [Tue, 7 Feb 2012 06:56:45 +0000 (06:56 +0000)]
Allways use g_list_prepend().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40912 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate the documentation to match the sort order. This documentation error was point...
cmaynard [Tue, 7 Feb 2012 03:20:33 +0000 (03:20 +0000)]
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.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40911 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoExport the mtp3_heuristic_standard preference and mtp3_standard_vals[].
morriss [Tue, 7 Feb 2012 02:19:11 +0000 (02:19 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40910 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:20:29 +0000 (22:20 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40909 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:19:07 +0000 (22:19 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40908 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:18:45 +0000 (22:18 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40907 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:16:52 +0000 (22:16 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40906 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:16:22 +0000 (22:16 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40905 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:15:53 +0000 (22:15 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40904 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:15:24 +0000 (22:15 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40903 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:14:30 +0000 (22:14 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40902 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:13:52 +0000 (22:13 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40901 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:13:32 +0000 (22:13 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40900 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:12:59 +0000 (22:12 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40899 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:12:32 +0000 (22:12 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40898 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:12:11 +0000 (22:12 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40897 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:06:28 +0000 (22:06 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40896 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:05:47 +0000 (22:05 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40895 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:05:10 +0000 (22:05 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40894 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:04:46 +0000 (22:04 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40893 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:04:24 +0000 (22:04 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40892 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:03:02 +0000 (22:03 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40891 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:02:36 +0000 (22:02 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40890 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:02:03 +0000 (22:02 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40889 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:01:37 +0000 (22:01 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40888 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 6 Feb 2012 22:01:04 +0000 (22:01 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40887 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoEnhance DNS Dissector (use WS function...)
alagoutte [Mon, 6 Feb 2012 21:59:53 +0000 (21:59 +0000)]
Enhance DNS Dissector (use WS function...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40886 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Guy Martin:
etxrab [Mon, 6 Feb 2012 19:21:11 +0000 (19:21 +0000)]
From Guy Martin:
Updated MP2T (MPEG2-TS) dissector


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40885 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Guy Martin:
etxrab [Mon, 6 Feb 2012 19:15:07 +0000 (19:15 +0000)]
From Guy Martin:
Add new linktype 243 for MPEG2-TS.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40884 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agopacket-netflow.c:4407: warning: integer constant is too large for 'long' type
etxrab [Mon, 6 Feb 2012 19:05:30 +0000 (19:05 +0000)]
packet-netflow.c:4407: warning: integer constant is too large for 'long' type

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40883 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Aamer Akhter:
etxrab [Mon, 6 Feb 2012 17:37:29 +0000 (17:37 +0000)]
From Aamer Akhter:
performance monitor 2.0 metric additions.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40882 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Cristian Constantin:
etxrab [Mon, 6 Feb 2012 17:32:37 +0000 (17:32 +0000)]
From Cristian Constantin:
slow voip/sip call flow for large captures.
Add missing update.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40881 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom David Wei:
etxrab [Mon, 6 Feb 2012 17:29:29 +0000 (17:29 +0000)]
From David Wei:
Update the latest IE's

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40880 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Matt Dainty:
etxrab [Mon, 6 Feb 2012 17:27:36 +0000 (17:27 +0000)]
From Matt Dainty:
Add array datatype parsing to AMQP dissector.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40879 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Cristian Constantin:
etxrab [Mon, 6 Feb 2012 17:23:04 +0000 (17:23 +0000)]
From Cristian Constantin:
slow voip/sip call flow for large captures.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40878 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6704
alagoutte [Mon, 6 Feb 2012 16:36:20 +0000 (16:36 +0000)]
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6704
DNS KEY RDATA contains an extra "Key id" field

Set Key Id is a generated item (in KEY and DNSKEY dns types)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40877 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a newline at the end of the file to avoid warning.
martinm [Mon, 6 Feb 2012 13:56:55 +0000 (13:56 +0000)]
Add a newline at the end of the file to avoid warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40876 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCopy over rev 40874 to gtk3
jmayer [Mon, 6 Feb 2012 11:22:21 +0000 (11:22 +0000)]
Copy over rev 40874 to gtk3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40875 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSMB response time stats dissapeared a while ago.
sahlberg [Mon, 6 Feb 2012 09:39:00 +0000 (09:39 +0000)]
SMB response time stats dissapeared a while ago.
This adds it back.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40874 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGOOSE Messages don't use the length field to perform the dissection.
etxrab [Sun, 5 Feb 2012 18:25:01 +0000 (18:25 +0000)]
GOOSE Messages don't use the length field to perform the dissection.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40873 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom walter schmid:
etxrab [Sun, 5 Feb 2012 16:19:21 +0000 (16:19 +0000)]
From walter schmid:
wrong reassemble of T30 msg if more data fields in T38 packet.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40872 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-02-05]
gerald [Sun, 5 Feb 2012 15:03:28 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-02-05]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40869 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Xiao Xiangquan:
etxrab [Sun, 5 Feb 2012 13:51:50 +0000 (13:51 +0000)]
From Xiao Xiangquan:
bt-dht and bt-utp should also be common dissectors while not only heuristic
ones. So we can use them with "Decode As..." command.

Applying the missing part as this seems to be an owerlapping patch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40868 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tony Trinh:
etxrab [Sun, 5 Feb 2012 13:30:27 +0000 (13:30 +0000)]
From Tony Trinh:
"matches" operator fails to match hex.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40867 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Alexander Koeppe:
etxrab [Sun, 5 Feb 2012 13:25:36 +0000 (13:25 +0000)]
From Alexander Koeppe:
Eliminate Mixture of libc and glibc in editcap.c


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40866 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix comments.
etxrab [Sun, 5 Feb 2012 13:24:04 +0000 (13:24 +0000)]
Fix comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40865 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to fix the compile errors on OS X:
jmayer [Sun, 5 Feb 2012 13:17:39 +0000 (13:17 +0000)]
Try to fix the compile errors on  OS X:

cc1: warnings being treated as errors
packet-aastra-aasp.c: In function 'dissect_a_binary_command':
packet-aastra-aasp.c:142: warning: unused parameter 'pinfo'
packet-aastra-aasp.c:428:25: error: "/*" within comment
packet-aastra-aasp.c:429:25: error: "/*" within comment
packet-aastra-aasp.c:430:25: error: "/*" within comment
packet-aastra-aasp.c:431:25: error: "/*" within comment
packet-aastra-aasp.c:432:25: error: "/*" within comment
packet-aastra-aasp.c:433:25: error: "/*" within comment
packet-aastra-aasp.c:434:25: error: "/*" within comment
packet-aastra-aasp.c:435:25: error: "/*" within comment
packet-aastra-aasp.c:436:25: error: "/*" within comment
packet-aastra-aasp.c:437:25: error: "/*" within comment
packet-aastra-aasp.c:438:25: error: "/*" within comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40864 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom billyjeans:
etxrab [Sun, 5 Feb 2012 13:09:10 +0000 (13:09 +0000)]
From billyjeans:
EAP-TLS cannot re-initialize properly if previous EAP-TLS conversation is not properly finished.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40863 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Michael Mann:
etxrab [Sun, 5 Feb 2012 13:05:15 +0000 (13:05 +0000)]
From Michael Mann:
Went through all stderr cases within tshark trying to make tshark "quieter".  I
basically ended up agreeing with the submitted in terms of what should be
switched to stdout from stderr.  The attached patch does that.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40862 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoForgot to commit the CMakeList.txt changes
jmayer [Sun, 5 Feb 2012 12:55:30 +0000 (12:55 +0000)]
Forgot to commit the CMakeList.txt changes

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40861 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Marek Tews:
etxrab [Sun, 5 Feb 2012 12:54:21 +0000 (12:54 +0000)]
From Marek Tews:
Aastra Signalling Protocol (AASP).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40860 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to get rid of non-ASCII characters.
etxrab [Sun, 5 Feb 2012 12:47:43 +0000 (12:47 +0000)]
Try to get rid of non-ASCII characters.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40859 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Jakub Zawadzki:
etxrab [Sun, 5 Feb 2012 12:15:12 +0000 (12:15 +0000)]
From Jakub Zawadzki:
Minimal version of Gadu-Gadu dissector (header only).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40858 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tyson Key:
etxrab [Sun, 5 Feb 2012 12:02:27 +0000 (12:02 +0000)]
From Tyson Key:
I've just finished writing a dissector for parts of the Sony FeliCa smartcard
application layer protocol, as documented in JIS X 6319-4, (partially in) ISO
18092, and in various documents made publicly available at


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40857 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCast it away.
etxrab [Sun, 5 Feb 2012 11:46:52 +0000 (11:46 +0000)]
Cast it away.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40856 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to fix some of the build problems, it still bumms out on:
etxrab [Sun, 5 Feb 2012 11:41:43 +0000 (11:41 +0000)]
Try to fix some of the build problems, it still bumms out on:
tap-follow.c(464) : error C2220: warning treated as error - no 'object' file gen
tap-follow.c(464) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(610) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(639) : warning C4267: 'initializing' : conversion from 'size_t' to
'int', possible loss of data
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40855 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoChecked in, with the following changes:
jmayer [Sun, 5 Feb 2012 11:34:04 +0000 (11:34 +0000)]
Checked in, with the following changes:

- Adapted packet-gsm_sim.c and CmakeLists.txt to match current content (trivial)
- Fixed warnings about //-style comments that were found running
   ../../tools/checkAPIs.pl -g deprecated -g prohibited -g abort -g termoutput packet-gsm_sim.c packet-etsi_card_app_toolkit.c
    Error: Found C++ style comments in packet-gsm_sim.c
- Not fixed (will lead to dissector abort if in a packet):
   ../../tools/checkhf.pl packet-gsm_sim.c packet-etsi_card_app_toolkit.c
    ERROR: NO ARRAY: packet-gsm_sim.c, hf_tprof_b19
    ERROR: NO ARRAY: packet-gsm_sim.c, hf_tprof_b18
    ERROR: NO ARRAY: packet-etsi_card_app_toolkit.c, hf_ctlv_bearer_descr
  Please provide the necessary element entries for the hf[] array in a
  followup patch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40854 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThere is a logic bug in this dissector that is exposed
jmayer [Sun, 5 Feb 2012 11:24:06 +0000 (11:24 +0000)]
There is a logic bug in this dissector that is exposed
by a set but unused warning. Hack around this for now.
Someone who knows the protocol should fix this.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40853 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom QA Cafe:
etxrab [Sun, 5 Feb 2012 10:39:12 +0000 (10:39 +0000)]
From QA Cafe:
Add support to follow UDP and TCP streams like wireshark does. UDP streams are
selected with IP address/port pairs. TCP stream are selected with either the
stream index or IP address/port pairs.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40852 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Harald Welte:
etxrab [Sun, 5 Feb 2012 10:23:56 +0000 (10:23 +0000)]
From Harald Welte:
TThis is a new dissector for the GSM A-bis OML protocol as specified in TS
including some Siemens and ip.access vendor-specific extensions.

The protocol is called from both classic ISDN (LAPD) based A-bis as well as the
gsm_ipa dissector.

- Fixed the encoding argument to proto_add_item()
- Removed Attribute as that does not compile on windows.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40851 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Harald Welte:
etxrab [Sun, 5 Feb 2012 10:03:05 +0000 (10:03 +0000)]
From Harald Welte:
This is an enhancement for the existing A-bis RSL protocol dissector for GSM
networks (as specified in Technical Specification 12.21 of the 3GPP).
this patch adds ip.access vendor-specific RSL extensions.

- Fixed the encoding argument to proto_add_item()
- Do not default to ip.accsess RSL.
- u_int8_t -> guint8


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40850 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Holger Hans Peter Freyther:
etxrab [Sun, 5 Feb 2012 09:09:51 +0000 (09:09 +0000)]
From Holger Hans Peter Freyther:
Begin new dissector for DVB/ETSI IP Data Cast (IPDC) Electronic Service Guide (ESG) dissector.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40849 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Stipe Tolj:
etxrab [Sun, 5 Feb 2012 08:56:27 +0000 (08:56 +0000)]
From Stipe Tolj:
Ensure that ALL response PDUs are displayed, and the corresponding description text for the reserved or vendor-specific error code is displayed.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40848 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Sylvain Munaut:
etxrab [Sun, 5 Feb 2012 08:14:09 +0000 (08:14 +0000)]
From Sylvain Munaut:


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40847 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix long standing but that prevented installation to
jmayer [Sun, 5 Feb 2012 07:41:53 +0000 (07:41 +0000)]
Fix long standing but that prevented installation to
work at all.
Next step ist to move docbook installation back into docbook/

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40846 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDocument which external files are used by the packet-x11.c generator
jmayer [Sun, 5 Feb 2012 07:37:32 +0000 (07:37 +0000)]
Document which external files are used by the packet-x11.c generator

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40845 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd note about unifying a4 and letter format builds.
jmayer [Sat, 4 Feb 2012 23:30:38 +0000 (23:30 +0000)]
Add note about unifying a4 and letter format builds.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40844 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate .gitignore with the last change in svn:ignore for Qt
alagoutte [Sat, 4 Feb 2012 17:36:10 +0000 (17:36 +0000)]
Update .gitignore with the last change in svn:ignore for Qt

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40843 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Harald Welte:
etxrab [Sat, 4 Feb 2012 15:44:10 +0000 (15:44 +0000)]
From Harald Welte:
lapdm dissector tries to defragment segment of different streams.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40842 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the magic incantation to get icons into the cmake build.
jmayer [Sat, 4 Feb 2012 14:27:14 +0000 (14:27 +0000)]
Add the magic incantation to get icons into the cmake build.
No idea why the qtcreate build worked without this.
See http://developer.qt.nokia.com/doc/qt-4.8/resources.html

@Gerald: I've most likely put this into the wrong place, please

Thanks to Alexander Neundorf for spotting this and proposing a

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40841 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- Add a comment how to improve the output of supported features later on.
jmayer [Sat, 4 Feb 2012 14:19:38 +0000 (14:19 +0000)]
- Add a comment how to improve the output of supported features later on.
- Move docbook pdf installation to toplevel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40840 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Francesco Fondelli:
etxrab [Sat, 4 Feb 2012 14:01:46 +0000 (14:01 +0000)]
From Francesco Fondelli:
Fix indentation.
(I restored "lost code")


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40839 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Colin O'Flynn:
etxrab [Sat, 4 Feb 2012 13:43:58 +0000 (13:43 +0000)]
From Colin O'Flynn:
Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40838 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Cristian Constantin:
etxrab [Sat, 4 Feb 2012 12:23:51 +0000 (12:23 +0000)]
From Cristian Constantin:
Slow loading/processing of conversations with over 500k frames.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40837 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Cristian Constantin:
etxrab [Sat, 4 Feb 2012 12:22:06 +0000 (12:22 +0000)]
From Cristian Constantin:
Dissable sorting while storing the data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40836 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Tobias Witek:
etxrab [Sat, 4 Feb 2012 12:13:59 +0000 (12:13 +0000)]
From Tobias Witek:
Improved filtering for TBCD values (IMSI and IMEI) in packet-meta.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40835 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom mdesharnais:
etxrab [Sat, 4 Feb 2012 11:59:37 +0000 (11:59 +0000)]
From mdesharnais:
RTP header extensions not correctly implement.

From me remove the old table based on payload type, this
implementation is more in line with RFC 3551.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40834 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate ignore list for in-tree builds with qtcreate
jmayer [Sat, 4 Feb 2012 10:04:04 +0000 (10:04 +0000)]
Update ignore list for in-tree builds with qtcreate

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40833 f5534014-38df-0310-8fa8-9805f1628bb7