7 years agoAdd a note as to how I was able to build & successfully use a Debug Qt Wireshark.
wmeier [Sun, 22 Jan 2012 19:52:40 +0000 (19:52 +0000)]
Add a note as to how I was able to build & successfully use a Debug Qt Wireshark.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-22]
gerald [Sun, 22 Jan 2012 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-22]

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

7 years agoAll valid file types should have file type strings (and, currently, they
guy [Sun, 22 Jan 2012 11:37:33 +0000 (11:37 +0000)]
All valid file types should have file type strings (and, currently, they
all do); get rid of the test for a null return from

If wtap_get_file_extensions_list() returns NULL, include the file type
in the list of filters, and use "*.*" as the filter.  That way the list
of filters will include all file types, even if you can't really ask
only for files of that type (actually, you can't really ask only for
files of *any* type unless you're running under a desktop environment
where file types are specified by, for example, looking for magic
numbers, as there's no guarantee that, for example, a pcap file will
have an extension at all, given that it might come from a command-line
tool that doesn't default to any extension).

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

7 years agoAllow sequence analysis to be done either for PDCP frames found in RLC
martinm [Sun, 22 Jan 2012 03:02:10 +0000 (03:02 +0000)]
Allow sequence analysis to be done either for PDCP frames found in RLC
frames, or logged at the PDCP level.  Provide a forward link to the next
SN frame for a channel.

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

7 years agoVarious small tweaks to sequence analysis/re-assembly, plus implement
martinm [Sun, 22 Jan 2012 02:55:47 +0000 (02:55 +0000)]
Various small tweaks to sequence analysis/re-assembly, plus implement
function to check for a frame being a retx as used by pdcp.

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

7 years agoCheck for DL HARQ retx before calling RLC dissector to avoid sequence
martinm [Sun, 22 Jan 2012 02:52:50 +0000 (02:52 +0000)]
Check for DL HARQ retx before calling RLC dissector to avoid sequence
number analysis problems.

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

7 years agoGoogle translate suggested a different spelling for Roman's name, so use it instead.
cmaynard [Sun, 22 Jan 2012 02:14:55 +0000 (02:14 +0000)]
Google translate suggested a different spelling for Roman's name, so use it instead.

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

7 years agoAdded Roman Dontsenko to the authors list for his contribution to fixing bug 5687...
cmaynard [Sun, 22 Jan 2012 02:11:54 +0000 (02:11 +0000)]
Added Roman Dontsenko to the authors list for his contribution to fixing bug 5687.  I did my best with the Cyrillic translation, but for the actual Cyrillic spelling of his name, refer to bug 5687.

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

7 years agoPatch from DXDragon [AT] yandex.ru (using e-mail address instead of name because...
cmaynard [Sun, 22 Jan 2012 01:59:00 +0000 (01:59 +0000)]
Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name because I don't know how to enter Cyrillic letters) to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687 - Some PGM options are not parsed correctly.

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

7 years agoWe already added the separator *if* we needed it; don't add it again.
guy [Sat, 21 Jan 2012 23:50:06 +0000 (23:50 +0000)]
We already added the separator *if* we needed it; don't add it again.

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

7 years agoWell, yeah, you can leave the list of patterns out, but then they don't
guy [Sat, 21 Jan 2012 23:48:03 +0000 (23:48 +0000)]
Well, yeah, you can leave the list of patterns out, but then they don't
show up in the UI, and they appear to show up in the UI in the Windows
apps I've seen, so I guess Windows apps put the list of patterns into
the description.

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

7 years agoFix calls to g_string_free() (added so as not to leak memory).
guy [Sat, 21 Jan 2012 23:45:15 +0000 (23:45 +0000)]
Fix calls to g_string_free() (added so as not to leak memory).

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

7 years agoAt least according to the Microsoft documentation, you don't duplicate
guy [Sat, 21 Jan 2012 23:44:19 +0000 (23:44 +0000)]
At least according to the Microsoft documentation, you don't duplicate
the list of patterns; see what happens.

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

7 years agoWhat you get from wtap_get_file_extensions_list() are extensions, not
guy [Sat, 21 Jan 2012 23:23:18 +0000 (23:23 +0000)]
What you get from wtap_get_file_extensions_list() are extensions, not
patterns; add the "*.".

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

7 years agoFix print call.
guy [Sat, 21 Jan 2012 23:09:40 +0000 (23:09 +0000)]
Fix print call.

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

7 years agoAppend the trailing ), don't overwrite the string.
guy [Sat, 21 Jan 2012 22:07:49 +0000 (22:07 +0000)]
Append the trailing ), don't overwrite the string.

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

7 years ago#define VENDOR_AT_AND_T 74
etxrab [Sat, 21 Jan 2012 21:59:37 +0000 (21:59 +0000)]
#define VENDOR_AT_AND_T 74

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

7 years agoTry to fix
etxrab [Sat, 21 Jan 2012 21:45:33 +0000 (21:45 +0000)]
Try to fix
packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function

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

7 years agoAdd the missing file from
etxrab [Sat, 21 Jan 2012 20:26:46 +0000 (20:26 +0000)]
Add the missing file from

Patch was whining about csn1.h fixing that i must have missed that csn1.c did not get patched.

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

7 years agoFix -v for QtShark
alagoutte [Sat, 21 Jan 2012 18:56:01 +0000 (18:56 +0000)]
Fix -v for QtShark

./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c
the function is common to GTK and Qt need to put in version_info.[ch] ?

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

7 years agoUpdate gitignore after the change of gtk directory
alagoutte [Sat, 21 Jan 2012 16:59:11 +0000 (16:59 +0000)]
Update gitignore after the change of gtk directory

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

7 years agoRevert a recent spelling change back to its UK variant.
cmaynard [Sat, 21 Jan 2012 16:09:08 +0000 (16:09 +0000)]
Revert a recent spelling change back to its UK variant.

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

7 years agoSync checkapi target with Makefile.common.
tuexen [Sat, 21 Jan 2012 12:29:05 +0000 (12:29 +0000)]
Sync checkapi target with Makefile.common.

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

7 years agoSync checkapi target with Makefile.nmake.
tuexen [Sat, 21 Jan 2012 12:22:01 +0000 (12:22 +0000)]
Sync checkapi target with Makefile.nmake.

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

7 years agoFrom Martin Lutz:
etxrab [Sat, 21 Jan 2012 12:21:29 +0000 (12:21 +0000)]
From Martin Lutz:
Updated the GOOSE dissector ASN.1 file to be able to display data for UTC timestamps.

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

7 years agoFrom Mike Morrin:
etxrab [Sat, 21 Jan 2012 12:08:14 +0000 (12:08 +0000)]
From Mike Morrin:
a patch which improves several aspects of GSM RLS/MAC

Generic improvements to the csn.1 dissector include:
•    Added a flag to the type descriptor structure so that any type can
(potentially) flagged as xxx_OR_NULL.  This was specifically needed for
UINT_OR_NULL for the ms capabilities struct.
•    Corrected the octet calculation in app of the proto_tree_add_text() and
proto_item_set_len() calls.
•    Changed the CSN_SERIALIZE so that the length of the length field can be
•    For CSN_NEXT_EXIST removed the requirement that the next type be CSN_END,
to allow truncation of multiple IEs.
•    For CSN_LEFT_ALIGNED_VAR_BITMAP corrected the handling of bit_offset.
•    Added a new type CSN_PADDING_BITS to make inspection of padding bits more
•    Improved the CSN_RECURSIVE_TARRAY_1 to show the array index.

Improvements to the gsm_rlcmac dissector include:
•    Comment out a couple of unused hf variables.
•    Rework the definition of EGPRS Ack/Nack Description so that the length IE
(and absence thereof) is handled correctly.  This is the original issue for
which the bug was raised.
•    Added Padding Bits definitions to all PDUs
•    Change the Multislot_capability_t and Content_t definitions to allow
truncation at any IE
•    Added proto_tree_add_protocol_format() calls so that the protocol can be
added to a display filter
•    Append Protocol to the PROTOCOL column and PDU type to the INFO column.

From me get rid of C++ style comments.


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

7 years agoSync checkapi target with Makefile.nmake.
tuexen [Sat, 21 Jan 2012 12:06:31 +0000 (12:06 +0000)]
Sync checkapi target with Makefile.nmake.

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

7 years agoGet make checkapi working again.
tuexen [Sat, 21 Jan 2012 11:45:57 +0000 (11:45 +0000)]
Get make checkapi working again.

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

7 years agoAdd missing variable.
guy [Sat, 21 Jan 2012 11:27:59 +0000 (11:27 +0000)]
Add missing variable.

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

7 years agoReplace wtap_file_extensions_string() with a routine that returns a
guy [Sat, 21 Jan 2012 08:59:21 +0000 (08:59 +0000)]
Replace wtap_file_extensions_string() with a routine that returns a
GSList of extensions for a file type, including extensions for the
compressed versions of those file types that we can read.

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

7 years agoIt's the Xoraya file type, not the Xoraya encapsulation, that was bogus.
guy [Sat, 21 Jan 2012 04:00:43 +0000 (04:00 +0000)]
It's the Xoraya file type, not the Xoraya encapsulation, that was bogus.

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

7 years ago"*.*" as a pattern for a given file type is pointless, as it doesn't
guy [Sat, 21 Jan 2012 03:55:40 +0000 (03:55 +0000)]
"*.*" as a pattern for a given file type is pointless, as it doesn't
select only files of that type; you might as well use "All Files (*.*)"
for that.

The default suffix is a suffix, not a pattern, so it shouldn't be

We only use the patterns on Windows, where file names are
case-insensitive, so there's no point in capital letters in suffixes.

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

7 years agoGet rid of an unused file type. If somebody wants it in the official
guy [Sat, 21 Jan 2012 03:52:19 +0000 (03:52 +0000)]
Get rid of an unused file type.  If somebody wants it in the official
Wireshark distribution, give us code to read it.  If somebody wants it
in their private version of Wireshark, they can manage that themselves.
(We should support plugins for file types at some point; I think we
already have support for Lua file readers.)

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

7 years agoFix a comment and some typos.
cmaynard [Sat, 21 Jan 2012 02:39:59 +0000 (02:39 +0000)]
Fix a comment and some typos.

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

7 years agoOr maybe we should just act as if QMake didn't exist and just try
guy [Sat, 21 Jan 2012 01:52:11 +0000 (01:52 +0000)]
Or maybe we should just act as if QMake didn't exist and just try
letting Boring Old Make do it; I have that autotools+make working with a
--with-qt option, albeit in a not-yet-ready-for-prime-time state.

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

7 years agoSet next pointer to NULL to avoid chasing non-existent UEs in list.
martinm [Sat, 21 Jan 2012 01:38:04 +0000 (01:38 +0000)]
Set next pointer to NULL to avoid chasing non-existent UEs in list.

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

7 years agoAvoid a potential infinite loop by stopping dissection when a message has no tlvblock...
cmaynard [Fri, 20 Jan 2012 22:03:52 +0000 (22:03 +0000)]
Avoid a potential infinite loop by stopping dissection when a message has no tlvblock.  Patch from Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687

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

7 years agoConvert forward slashes in URI to backslashes if WIN32. Patch from Cal Turney via...
cmaynard [Fri, 20 Jan 2012 21:20:53 +0000 (21:20 +0000)]
Convert forward slashes in URI to backslashes if WIN32.  Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237

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

7 years agoFix some duplicate display filter names.
cmaynard [Fri, 20 Jan 2012 20:20:40 +0000 (20:20 +0000)]
Fix some duplicate display filter names.

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

7 years agoChange display filter name from "ldp.tlv...." to "ldp.msg.tlv...." to be like the...
cmaynard [Fri, 20 Jan 2012 20:12:44 +0000 (20:12 +0000)]
Change display filter name from "ldp.tlv...." to "ldp.msg.tlv...." to be like the rest.

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

7 years agoFix some duplicate display filter names.
cmaynard [Fri, 20 Jan 2012 19:40:13 +0000 (19:40 +0000)]
Fix some duplicate display filter names.

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

7 years agoFix some duplicate display filter names.
cmaynard [Fri, 20 Jan 2012 19:18:41 +0000 (19:18 +0000)]
Fix some duplicate display filter names.

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

7 years agoFix Coverity CID 1366: MISSING BREAK
cmaynard [Fri, 20 Jan 2012 18:53:06 +0000 (18:53 +0000)]
Fix Coverity CID 1366: MISSING BREAK

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

7 years agoFix Coverity CID 1369: UNUSED_VALUE by deleting duplicate and unecessary line of...
cmaynard [Fri, 20 Jan 2012 18:41:10 +0000 (18:41 +0000)]
Fix Coverity CID 1369: UNUSED_VALUE by deleting duplicate and unecessary line of code.

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

7 years agoFix Coverity CID 1370: UNREACHABLE by deleting erroneous break;
cmaynard [Fri, 20 Jan 2012 18:35:56 +0000 (18:35 +0000)]
Fix Coverity CID 1370: UNREACHABLE by deleting erroneous break;

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

7 years agoAdd more configuration information to config.pri which lets us remove
gerald [Fri, 20 Jan 2012 18:30:44 +0000 (18:30 +0000)]
Add more configuration information to config.pri which lets us remove
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.

Add ui\qt\config.pri to the top-level "all" nmake target.

Update README.qt.

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

7 years agoAs reported by hyphenated on #wireshark:
jmayer [Fri, 20 Jan 2012 16:12:24 +0000 (16:12 +0000)]
As reported by hyphenated on #wireshark:
don't increase offset by 4 after two add_item(...,2 ,...) commands.
Increase by 2 after each add_item instead.

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

7 years agoManually revert the changes to CMakeLists.txt from commit 40602 - they should not...
jmayer [Fri, 20 Jan 2012 11:02:15 +0000 (11:02 +0000)]
Manually revert the changes to CMakeLists.txt from commit 40602 - they should not be necessary/are wrong

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

7 years agoFrom Pascal Quantin:
jake [Fri, 20 Jan 2012 07:49:12 +0000 (07:49 +0000)]
From Pascal Quantin:
Some test equipments can send weird Protocol Configuration Options IE in the
Attach Accept message with an empty protocol identifier content. Wireshark
will trigger an assert when dissecting those messages because it does not
check the tvb length before calling the sub dissector.
With checking the protocol identifier length before calling the sub dissector,
the PCO is decoded correctly.

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

7 years agoFix Fix "bt-dht [..] NOT registered properly" as reported in Bug #6571.
wmeier [Fri, 20 Jan 2012 03:24:05 +0000 (03:24 +0000)]
Fix Fix "bt-dht [..] NOT registered properly" as reported in Bug #6571.

"bt-dht [...] should also be common dissectors while not only heuristic
ones. So we can use them with 'Decode As...' command."

 -Register dissector handle so the dissector can be accessed via "decode-as".

From me:
   1. Given that the current heuristic is much too weak and
      causes 'false positives':
        Add a preference to allow enabling/disabling of heuristic dissection.

      The default is 'disabled' since the current heuristic is quite weak.
      (For example: The heuristic incorrectly dissects about 40
       files in menagerie/public as being the BT-DHT protocol).
      Note: only heuristic dissection is disabled; 'decode-as' remains


1. Fix some bugs wherein bytes in the hex pane were not highlighted
   when a field was selected in the details pane.
2. Do some minor re-formatting of the source code.

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

7 years agoBug 6448 says the embedded Python stuff does not really work.
morriss [Fri, 20 Jan 2012 03:20:35 +0000 (03:20 +0000)]
Bug 6448 says the embedded Python stuff does not really work.
And if I run Valgrind with Python enabled, I get pages of errors related to it.

So: disable Python by default.

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

7 years agoAdd 'heur_dissector_set_enabled()' to allow a dissector to enable/disable heuristic...
wmeier [Fri, 20 Jan 2012 02:43:37 +0000 (02:43 +0000)]
Add 'heur_dissector_set_enabled()' to allow a dissector to enable/disable heuristic dissection;
Rename some vars;
Do some minor re-indentation and whitespace changes.

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

7 years agoTry copying our plugins to an accessible directory. This assumes you've set
gerald [Fri, 20 Jan 2012 01:10:40 +0000 (01:10 +0000)]
Try copying our plugins to an accessible directory. This assumes you've set

On Windows, generate a QMake include file (config.pri) from config.nmake.

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

7 years agoRemove or mark unused variables.
gerald [Fri, 20 Jan 2012 00:01:53 +0000 (00:01 +0000)]
Remove or mark unused variables.

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

7 years agoSlightly more details on building the qt version on Linux.
jmayer [Thu, 19 Jan 2012 23:58:25 +0000 (23:58 +0000)]
Slightly more details on building the qt version on Linux.

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

7 years agoUpdate abi-compliance-checker options to be compatible with 1.96.1
rbalint [Thu, 19 Jan 2012 22:55:52 +0000 (22:55 +0000)]
Update abi-compliance-checker options to be compatible with 1.96.1

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

7 years agoUpdate generated headers changed by last commit
rbalint [Thu, 19 Jan 2012 22:55:46 +0000 (22:55 +0000)]
Update generated headers changed by last commit

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

7 years agofix compile errors found by dumpabi target
rbalint [Thu, 19 Jan 2012 22:55:37 +0000 (22:55 +0000)]
fix compile errors found by dumpabi target

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

7 years agogtk moved to ui/ missed this file on checkin
jmayer [Thu, 19 Jan 2012 22:32:22 +0000 (22:32 +0000)]
gtk moved to ui/ missed this file on checkin

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

7 years agoFix:
jmayer [Thu, 19 Jan 2012 22:18:06 +0000 (22:18 +0000)]

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c: In function ‘dissect_rohc_ir_rtp_profile_dynamic’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c:775:21: error: variable ‘cc’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors

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

7 years agoFix some duplicate display filter names.
cmaynard [Thu, 19 Jan 2012 21:57:24 +0000 (21:57 +0000)]
Fix some duplicate display filter names.

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

7 years agoFix some duplicate display filter names.
cmaynard [Thu, 19 Jan 2012 21:01:52 +0000 (21:01 +0000)]
Fix some duplicate display filter names.

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

7 years agoFix some duplicate display filter names.
cmaynard [Thu, 19 Jan 2012 20:19:28 +0000 (20:19 +0000)]
Fix some duplicate display filter names.

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

7 years agoUpdate comments and dissection of comptessed lists
etxrab [Thu, 19 Jan 2012 19:43:02 +0000 (19:43 +0000)]
Update comments and dissection of comptessed lists

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

7 years agoUpdate a couple of asn1-generated dissectors.
cmaynard [Thu, 19 Jan 2012 19:33:21 +0000 (19:33 +0000)]
Update a couple of asn1-generated dissectors.

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

7 years agoFix a duplicate display filter name.
cmaynard [Thu, 19 Jan 2012 19:25:33 +0000 (19:25 +0000)]
Fix a duplicate display filter name.

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

7 years agoFix some duplicate display filter names.
cmaynard [Thu, 19 Jan 2012 19:15:13 +0000 (19:15 +0000)]
Fix some duplicate display filter names.

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

7 years agoLocalize a global variable; Do minor reformatting.
wmeier [Thu, 19 Jan 2012 17:42:28 +0000 (17:42 +0000)]
Localize a global variable; Do minor reformatting.

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

7 years agoUpdate list of deprecated GLib fcns;
wmeier [Thu, 19 Jan 2012 14:22:46 +0000 (14:22 +0000)]
Update list of deprecated GLib fcns;
Add comment about Wireshark build defines G_DISABLE_DEPRECATED.

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

7 years agoAdd icons for pipe interfaces. This allows for easier
tuexen [Thu, 19 Jan 2012 13:02:32 +0000 (13:02 +0000)]
Add icons for pipe interfaces. This allows for easier
testing the upcoming patch, which improves the
infrastructure to handle interfaces for capturing.
Obtained from Irene Ruengeler.

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

7 years agoComment out hf and ett - there is no need to register them while they
martinm [Thu, 19 Jan 2012 03:45:11 +0000 (03:45 +0000)]
Comment out hf and ett - there is no need to register them while they
are empty.

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

7 years agoAdd casts and don't initialise empty hf array.
martinm [Thu, 19 Jan 2012 03:27:41 +0000 (03:27 +0000)]
Add casts and don't initialise empty hf array.

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

7 years agoAdd a dissector "mac-lte-framed" that uses the same framing format as
martinm [Thu, 19 Jan 2012 02:58:53 +0000 (02:58 +0000)]
Add a dissector "mac-lte-framed" that uses the same framing format as
the existing "mac-lte" UDP heuristic dissector. It is hoped that it will be
possible to register a DLT for use with this format.

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

7 years agoGet rid of no-longer-applicable comments.
guy [Wed, 18 Jan 2012 23:41:07 +0000 (23:41 +0000)]
Get rid of no-longer-applicable comments.

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

7 years agoGet rid of some redeclarations, include "ui/recent_utils.h" to get those
guy [Wed, 18 Jan 2012 23:40:04 +0000 (23:40 +0000)]
Get rid of some redeclarations, include "ui/recent_utils.h" to get those

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

7 years agoAnother fix for the move of recent.h.
guy [Wed, 18 Jan 2012 23:37:50 +0000 (23:37 +0000)]
Another fix for the move of recent.h.

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

7 years agoLine up #define values.
guy [Wed, 18 Jan 2012 22:05:47 +0000 (22:05 +0000)]
Line up #define values.

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

7 years agoTabs are not *ipso facto* 4 spaces.
guy [Wed, 18 Jan 2012 22:05:01 +0000 (22:05 +0000)]
Tabs are not *ipso facto* 4 spaces.

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

7 years agoFollowing the move of recent.*
alagoutte [Wed, 18 Jan 2012 22:00:18 +0000 (22:00 +0000)]
Following the move of recent.*

Fix : No rule to make target « ../gtk/recent.c », needed for « recent.c ». Stop.

Not need to copy recent.c in qt working directory and use the common recent.c file.

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

7 years agoFrom Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743
alagoutte [Wed, 18 Jan 2012 21:44:21 +0000 (21:44 +0000)]
From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743
[PATCH] Enhance the Spice dissector to deal with mini headers

Spice recently gained the ability to use smaller packet headers.
This patch adds support to it, along with small other fixes/enhancements - none of which really interesting.

From me :
Fix a Clang Warning :
packet-spice.c:1303:5: warning: Value stored to 'offset' is never read

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

7 years agoFix a typo; Remove a dup.
wmeier [Wed, 18 Jan 2012 21:37:55 +0000 (21:37 +0000)]
Fix a typo; Remove a dup.

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

7 years agoFrom Tom Brezinski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6746
alagoutte [Wed, 18 Jan 2012 21:23:30 +0000 (21:23 +0000)]
From Tom Brezinski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6746
Adding support for Network Instruments 802.11 wireless captures

Attaching very simple change to allow reading of Network Instruments Observer 802.11 wireless capture files.

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

7 years ago#include <epan/crypt/crypt-*.h> => #include <epan/crypt/*.h>
cmaynard [Wed, 18 Jan 2012 21:20:50 +0000 (21:20 +0000)]
#include <epan/crypt/crypt-*.h> => #include <epan/crypt/*.h>

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

7 years agoUpdate:
wmeier [Wed, 18 Jan 2012 21:08:18 +0000 (21:08 +0000)]
 - Mark GDK functions which aren't used as 'E'
 - Add GTK functions deprecated after GTK 2.20
 - Add some comments about use of GTK_DISABLE_DEPRECATED
 - reformat

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

7 years agoFix some duplicate display filter names.
cmaynard [Wed, 18 Jan 2012 21:07:53 +0000 (21:07 +0000)]
Fix some duplicate display filter names.

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

7 years agoNew include file needs to be included.
guy [Wed, 18 Jan 2012 20:55:55 +0000 (20:55 +0000)]
New include file needs to be included.

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

7 years agoAnother change for the recent changes (in both senses of "recent
guy [Wed, 18 Jan 2012 20:38:51 +0000 (20:38 +0000)]
Another change for the recent changes (in both senses of "recent
changes" :-)).

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

7 years agoReflect the move of recent.c from ui/gtk to the top-level directory.
guy [Wed, 18 Jan 2012 20:23:30 +0000 (20:23 +0000)]
Reflect the move of recent.c from ui/gtk to the top-level directory.

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

7 years agoAnother fix for the move of recent.h to the ui directory.
guy [Wed, 18 Jan 2012 20:11:06 +0000 (20:11 +0000)]
Another fix for the move of recent.h to the ui directory.

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

7 years agoReflect the changes to make the recent-file code GUI-independent.
guy [Wed, 18 Jan 2012 19:59:13 +0000 (19:59 +0000)]
Reflect the changes to make the recent-file code GUI-independent.

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

7 years agoAdd some files that didn't get checked in.
guy [Wed, 18 Jan 2012 19:47:44 +0000 (19:47 +0000)]
Add some files that didn't get checked in.

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

7 years agoRestructure the recent file code so that recent.c is GUI-independent;
guy [Wed, 18 Jan 2012 19:38:34 +0000 (19:38 +0000)]
Restructure the recent file code so that recent.c is GUI-independent;
move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

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

7 years agoAdd more to dissect_compressed_list()
etxrab [Tue, 17 Jan 2012 21:27:48 +0000 (21:27 +0000)]
Add more to dissect_compressed_list()

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

7 years agoFix warning about a variable that is written to only.
jmayer [Tue, 17 Jan 2012 18:27:01 +0000 (18:27 +0000)]
Fix warning about a variable that is written to only.

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

7 years agoMark a couple of unused parameters as such.
martinm [Tue, 17 Jan 2012 18:23:11 +0000 (18:23 +0000)]
Mark a couple of unused parameters as such.

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

7 years agoEnhance dissection of compressed lists.
etxrab [Tue, 17 Jan 2012 17:57:52 +0000 (17:57 +0000)]
Enhance dissection of compressed lists.

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

7 years agoIndicate which version of GTK+ is being used to build Wireshark, and
guy [Tue, 17 Jan 2012 05:22:56 +0000 (05:22 +0000)]
Indicate which version of GTK+ is being used to build Wireshark, and
also indicate if we're including the Mac OS X integration library.

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

7 years agoFix typo.
guy [Tue, 17 Jan 2012 04:50:56 +0000 (04:50 +0000)]
Fix typo.

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

7 years agoFix test (equality in the test command is =, not ==).
guy [Tue, 17 Jan 2012 04:48:13 +0000 (04:48 +0000)]
Fix test (equality in the test command is =, not ==).

Split lines.

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

7 years agoRename the GTK_OK variable to have_gtk; make sure it's always set. Test
guy [Tue, 17 Jan 2012 04:45:12 +0000 (04:45 +0000)]
Rename the GTK_OK variable to have_gtk; make sure it's always set.  Test
it, instead of no_gtk, to see whether we should check for the OS X
integration functions; I think no_gtk is an internal detail of the
autoconf macros for GTK+, so let's not depend on it.

Clean up indentation.

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