Commit graph

38842 commits

Author SHA1 Message Date
Chris Maynard
9105d0b0c9 Revert a recent spelling change back to its UK variant.
svn path=/trunk/; revision=40631
2012-01-21 16:09:08 +00:00
Michael Tüxen
3e1a0cacaf Sync checkapi target with Makefile.common.
svn path=/trunk/; revision=40630
2012-01-21 12:29:05 +00:00
Michael Tüxen
c63ad2db03 Sync checkapi target with Makefile.nmake.
svn path=/trunk/; revision=40629
2012-01-21 12:22:01 +00:00
Anders Broman
37b1c97c13 From Martin Lutz:
Updated the GOOSE dissector ASN.1 file to be able to display data for UTC timestamps.

svn path=/trunk/; revision=40628
2012-01-21 12:21:29 +00:00
Anders Broman
00bf1ba8d3 From Mike Morrin:
a patch which improves several aspects of GSM RLS/MAC
dissection.

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
specified.
•    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
convenient.
•    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.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6375

svn path=/trunk/; revision=40627
2012-01-21 12:08:14 +00:00
Michael Tüxen
0c682968dd Sync checkapi target with Makefile.nmake.
svn path=/trunk/; revision=40626
2012-01-21 12:06:31 +00:00
Michael Tüxen
2e6455f3c7 Get make checkapi working again.
svn path=/trunk/; revision=40625
2012-01-21 11:45:57 +00:00
Guy Harris
f478979299 Add missing variable.
svn path=/trunk/; revision=40624
2012-01-21 11:28:02 +00:00
Guy Harris
e4a193fe5e 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.

svn path=/trunk/; revision=40623
2012-01-21 08:59:21 +00:00
Guy Harris
020d9491da It's the Xoraya file type, not the Xoraya encapsulation, that was bogus.
svn path=/trunk/; revision=40622
2012-01-21 04:00:43 +00:00
Guy Harris
97ad2f8177 "*.*" 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
"*.{something}".

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

svn path=/trunk/; revision=40621
2012-01-21 03:55:40 +00:00
Guy Harris
e3712a53da 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.)

svn path=/trunk/; revision=40620
2012-01-21 03:52:19 +00:00
Chris Maynard
e4862cf115 Fix a comment and some typos.
svn path=/trunk/; revision=40619
2012-01-21 02:39:59 +00:00
Guy Harris
32276980cf 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.

svn path=/trunk/; revision=40618
2012-01-21 01:52:11 +00:00
Martin Mathieson
f3a9929b86 Set next pointer to NULL to avoid chasing non-existent UEs in list.
svn path=/trunk/; revision=40617
2012-01-21 01:38:04 +00:00
Chris Maynard
c2f5cf46de 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
svn path=/trunk/; revision=40616
2012-01-20 22:03:52 +00:00
Chris Maynard
80087898ea Convert forward slashes in URI to backslashes if WIN32. Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237
svn path=/trunk/; revision=40615
2012-01-20 21:20:53 +00:00
Chris Maynard
d528b4b0f1 Fix some duplicate display filter names.
svn path=/trunk/; revision=40614
2012-01-20 20:20:40 +00:00
Chris Maynard
15be6540bd Change display filter name from "ldp.tlv...." to "ldp.msg.tlv...." to be like the rest.
svn path=/trunk/; revision=40613
2012-01-20 20:12:44 +00:00
Chris Maynard
40252924b4 Fix some duplicate display filter names.
svn path=/trunk/; revision=40612
2012-01-20 19:40:13 +00:00
Chris Maynard
fe7c04abf1 Fix some duplicate display filter names.
svn path=/trunk/; revision=40611
2012-01-20 19:18:41 +00:00
Chris Maynard
07ef77a875 Fix Coverity CID 1366: MISSING BREAK
svn path=/trunk/; revision=40610
2012-01-20 18:53:06 +00:00
Chris Maynard
b6a18e9b28 Fix Coverity CID 1369: UNUSED_VALUE by deleting duplicate and unecessary line of code.
svn path=/trunk/; revision=40609
2012-01-20 18:41:10 +00:00
Chris Maynard
0733183dc2 Fix Coverity CID 1370: UNREACHABLE by deleting erroneous break;
svn path=/trunk/; revision=40608
2012-01-20 18:35:56 +00:00
Gerald Combs
463b3178e8 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.

svn path=/trunk/; revision=40607
2012-01-20 18:30:44 +00:00
Jörg Mayer
dbf1be8944 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.

svn path=/trunk/; revision=40606
2012-01-20 16:12:24 +00:00
Jörg Mayer
5357769aca Manually revert the changes to CMakeLists.txt from commit 40602 - they should not be necessary/are wrong
svn path=/trunk/; revision=40605
2012-01-20 11:02:15 +00:00
Jaap Keuter
72ebaa39e3 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.

svn path=/trunk/; revision=40604
2012-01-20 07:49:12 +00:00
Bill Meier
1311f29800 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."

Essentially:
 -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
            enabled.

Also:

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.


svn path=/trunk/; revision=40603
2012-01-20 03:24:05 +00:00
Jeff Morriss
0a6eca4097 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.

svn path=/trunk/; revision=40602
2012-01-20 03:20:35 +00:00
Bill Meier
b83e1b218f 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.

svn path=/trunk/; revision=40601
2012-01-20 02:43:37 +00:00
Gerald Combs
0829150550 Try copying our plugins to an accessible directory. This assumes you've set
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.

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

svn path=/trunk/; revision=40600
2012-01-20 01:10:40 +00:00
Gerald Combs
41c54f9e5d Remove or mark unused variables.
svn path=/trunk/; revision=40599
2012-01-20 00:01:53 +00:00
Jörg Mayer
e1708e9edd Slightly more details on building the qt version on Linux.
svn path=/trunk/; revision=40598
2012-01-19 23:58:25 +00:00
Balint Reczey
a84ed29e2b Update abi-compliance-checker options to be compatible with 1.96.1
svn path=/trunk/; revision=40597
2012-01-19 22:55:52 +00:00
Balint Reczey
42e55d4533 Update generated headers changed by last commit
svn path=/trunk/; revision=40596
2012-01-19 22:55:46 +00:00
Balint Reczey
26503be7dc fix compile errors found by dumpabi target
svn path=/trunk/; revision=40595
2012-01-19 22:55:37 +00:00
Jörg Mayer
7b97eb7de2 gtk moved to ui/ missed this file on checkin
svn path=/trunk/; revision=40594
2012-01-19 22:32:22 +00:00
Jörg Mayer
64ddaef37b Fix:
/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



svn path=/trunk/; revision=40593
2012-01-19 22:18:06 +00:00
Chris Maynard
436b44b99e Fix some duplicate display filter names.
svn path=/trunk/; revision=40592
2012-01-19 21:57:24 +00:00
Chris Maynard
dea0a5d277 Fix some duplicate display filter names.
svn path=/trunk/; revision=40591
2012-01-19 21:01:52 +00:00
Chris Maynard
cb8805e543 Fix some duplicate display filter names.
svn path=/trunk/; revision=40590
2012-01-19 20:19:28 +00:00
Anders Broman
61b3c117a1 Update comments and dissection of comptessed lists
svn path=/trunk/; revision=40589
2012-01-19 19:43:02 +00:00
Chris Maynard
8fdfa92ecb Update a couple of asn1-generated dissectors.
svn path=/trunk/; revision=40588
2012-01-19 19:33:21 +00:00
Chris Maynard
efbb310223 Fix a duplicate display filter name.
svn path=/trunk/; revision=40587
2012-01-19 19:25:33 +00:00
Chris Maynard
c2208aa172 Fix some duplicate display filter names.
svn path=/trunk/; revision=40586
2012-01-19 19:15:13 +00:00
Bill Meier
8e4aab0ed8 Localize a global variable; Do minor reformatting.
svn path=/trunk/; revision=40585
2012-01-19 17:42:28 +00:00
Bill Meier
cffa41f052 Update list of deprecated GLib fcns;
Add comment about Wireshark build defines G_DISABLE_DEPRECATED.

svn path=/trunk/; revision=40584
2012-01-19 14:22:46 +00:00
Michael Tüxen
cb470474ab 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.

svn path=/trunk/; revision=40583
2012-01-19 13:02:32 +00:00
Martin Mathieson
96d0f00b52 Comment out hf and ett - there is no need to register them while they
are empty.

svn path=/trunk/; revision=40582
2012-01-19 03:46:02 +00:00