Commit Graph

55207 Commits

Author SHA1 Message Date
Guy Harris 4f4e01b36b Don't treat int return values as valid wtap_open_return_val values.
They happen to be, at least now, but that's not valid in C++, and it's
probably unwise in any case.

Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff
Reviewed-on: https://code.wireshark.org/review/4585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:14:37 +00:00
Guy Harris 9754192f9b Cast size_t to to gulong as the length argument to g_snprintf().
Sadly, the GTK+ folks decided not to use size_t for the size argument,
so it doesn't do the right thing on LLP64 platforms such as Windows.

Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f
Reviewed-on: https://code.wireshark.org/review/4584
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:09:29 +00:00
Guy Harris 5947291294 Fix declared types of open routines.
Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e
Reviewed-on: https://code.wireshark.org/review/4583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 01:04:43 +00:00
Gerald Combs bea24cfdad CMake: Bundle our plugins.
plugins/*/CMakeLists.txt has a lot of repitition. We might want to
create a module or include file to simplify things.

Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852
Reviewed-on: https://code.wireshark.org/review/4582
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 23:57:43 +00:00
Guy Harris 45e462985d Use an enum for the open-routine return value, as per Evan Huus's suggestion.
Clean up some things we ran across while making those changes.

Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
Reviewed-on: https://code.wireshark.org/review/4581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09 23:45:30 +00:00
Pascal Quantin 112c90a04b Kerberos: fix decryption of DCERPC with Kerberos encryption
Bug: 10538
Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c
Reviewed-on: https://code.wireshark.org/review/4566
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 21:45:18 +00:00
Pascal Quantin 7690afbc54 Kerberos: remove debug logs when loading a keytab
Bug: 10543
Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
Reviewed-on: https://code.wireshark.org/review/4567
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:57:56 +00:00
Pascal Quantin 40e6d764c5 GTPv2: fix an infinite loop
Bug: 10548
Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
Reviewed-on: https://code.wireshark.org/review/4578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:34:16 +00:00
Gerald Combs e00ac05cf3 CMake: Build an application bundle (Wireshark.app) on OS X.
Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on
OS X and disabled elsewhere. The bundle is currently bare-bones and only
contains the main executables, Info.plist, and application icon.

Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is
set and on Windows.

Start updating CPackConfig.txt for OS X packaging.

To do:

  - Add supporting libraries and frameworks.

  - Make the bundle standalone. I.e. call FIXUP_BUNDLE or
    replicate the relevant parts of osx-app.sh

Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb
Reviewed-on: https://code.wireshark.org/review/4577
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 20:07:48 +00:00
Michael Mann 58cc452d6f Eliminate proto_tree_add_text from packet-lmp.c
Also "refactored" a few fields into proto_tree_add_bitmask calls.

Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78
Reviewed-on: https://code.wireshark.org/review/4575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09 19:47:38 +00:00
Sean O. Stalley 608207fcf6 Add Dissection of MA packets over UDP
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6
Reviewed-on: https://code.wireshark.org/review/4576
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 19:41:19 +00:00
Michael Mann 39b281461d Eliminate proto_tree_add_text from packet-nbns.c
Some other cleanup while in the neighborhood.  Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there.

Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a
Reviewed-on: https://code.wireshark.org/review/4574
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09 17:13:39 +00:00
Anish Bhatt 1c51075376 [BACnet][trivial] change strings as per Bug 9640
Change-Id: I542b5a96bcff6c779359b80ddce513524852272c
Reviewed-on: https://code.wireshark.org/review/4572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-09 07:49:55 +00:00
Stig Bjørlykke 4edda1b2ce Lua: Improved TreeItem:add documentation.
The protofield is optional and can not be replaced with 'nil'
as with the other fields for this function.

Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456
Reviewed-on: https://code.wireshark.org/review/4549
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-09 05:42:13 +00:00
Guy Harris e7e2f9c639 Make the OPEN_INFO_ values members of an enum.
Change-Id: I93dbd14f81492764bf5854ee40eebcd1e04f3e01
Reviewed-on: https://code.wireshark.org/review/4570
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09 00:27:32 +00:00
Gerald Combs 3ee8efdfea Be less lazy about disabling a Visual C++ warning.
As Graham pointed out, "#pragma warning(disable..." affects the rest
of the file. Add a push+pop so that we only operate on the line in
question. Ideally we'd be able to use "suppress" but an "#endif"
prevents that.

Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef
Reviewed-on: https://code.wireshark.org/review/4569
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 22:50:17 +00:00
Guy Harris d1ec1e85f8 Use WTAP_ERR_DECOMPRESS for decompression errors.
Distringuish "the compression data has a problem" from "the capture file
(not compressed, or after decompression) data has a problem", with
WTAP_ERR_DECOMPRESS used for the former (whether it's the gzipping
decoded by our gunzip code or the Sniffer compression) and
WTAP_ERR_BAD_FILE used for the latter.

Change-Id: I8e6bff7edb480deba00c52a9e5afff607492e085
Reviewed-on: https://code.wireshark.org/review/4568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 22:49:08 +00:00
Tomasz Moń 0066776f72 Fix --extcap-dlts call in extcap_example.py.
There is regular expression that extracts only the number from
--extcap-interface argument and only that number (as string) is being
passed to extcap_dlts().

Change-Id: I5159f9405a766c1edff792213b2aef72b9a29ba4
Reviewed-on: https://code.wireshark.org/review/4550
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-08 21:32:40 +00:00
Guy Harris c83169f343 Only set err_info on an error, and use g_strdup_printf().
If the goal is to look like a libwiretap routine, we only need to set
*err_info on an error, and we should set it to a g_mallocated string (or
NULL).

Handle WTAP_ERR_UNSUPPORTED while we're at it - we never return it, but
we never return WTAP_ERR_UNSUPPORTED_ENCAP, either, but we handle it.

Change-Id: I9d93c43278d22f0fa77ec1cf7f29b476c8dd0dd0
Reviewed-on: https://code.wireshark.org/review/4565
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 21:13:17 +00:00
Guy Harris dbf8024eeb No need to set *err_info if there's no error.
Change-Id: I98ae9ec50e079d48b6247bb208528b7c5ad16027
Reviewed-on: https://code.wireshark.org/review/4564
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 21:05:05 +00:00
Guy Harris a307ed66cc Robopatch and remove #MISSING comments.
Change-Id: I611882a8b268046665488381be64aca89cdf3194
Reviewed-on: https://code.wireshark.org/review/4563
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:54:40 +00:00
Guy Harris 21e844bd82 Use WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files.
Get rid of WTAP_ERR_UNC_TRUNCATED and WTAP_ERR_UNC_BAD_OFFSET, and lump
them under WTAP_ERR_BAD_FILE, with an error string; they're just another
form of "this file isn't a valid file of the type in question".

Change-Id: I0e9ac7c2ee66c8d789234a301c1dc2173aef1312
Reviewed-on: https://code.wireshark.org/review/4562
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:50:42 +00:00
Gerald Combs c303a2ebf5 Make sure we don't dereference a null pointer.
Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123
Reviewed-on: https://code.wireshark.org/review/4561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 20:46:20 +00:00
Guy Harris ea5587a090 Fix a comment.
Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190
Reviewed-on: https://code.wireshark.org/review/4560
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:25:19 +00:00
Stig Bjørlykke 23286b7b14 ANSI 683: Removed unused assignments.
Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014
Reviewed-on: https://code.wireshark.org/review/4558
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 20:12:37 +00:00
Guy Harris 97e462d116 "long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER.
Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae
Reviewed-on: https://code.wireshark.org/review/4559
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:10:07 +00:00
Gerald Combs c55d69780b Try to speed up ping-dependent capture tests.
Ping four times a second for ~60 seconds. Save the subprocess PID so that
we can kill it when we're done with each test instead of waiting for it
to finish.

Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6
Reviewed-on: https://code.wireshark.org/review/4557
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 18:54:13 +00:00
Guy Harris 70ba2f88d1 Set err_info to null for errors that don't have an informaton string.
Change-Id: Ibbcf3496ebfb20c53b953db84b2ddb69083dcb86
Reviewed-on: https://code.wireshark.org/review/4556
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 18:44:30 +00:00
Tomasz Moń 5c0a3beee2 Remove redundant and erroneous debug log message.
Change-Id: I91d6131b3b4b7ef670f0d188ebd6da3947c49bdc
Reviewed-on: https://code.wireshark.org/review/4548
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 18:11:37 +00:00
Alexis La Goutte fb6e0430aa DCERPC (DRSUAPI) Fix typo found on idl file
Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de
Reviewed-on: https://code.wireshark.org/review/4554
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 17:59:41 +00:00
Johan Wahl 7207d2f8b0 SIP Enhance dissecion of PATH
Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8
Reviewed-on: https://code.wireshark.org/review/4543
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08 13:43:20 +00:00
Anish Bhatt 57a7aca8c3 elmi: Fix bug in message type coding
Bug: 10531
Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e
Reviewed-on: https://code.wireshark.org/review/4542
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-08 11:22:03 +00:00
Anish Bhatt 439c0b88a6 [tools] Add missing GPL license to generate-bacnet-vendors.py
Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa
Reviewed-on: https://code.wireshark.org/review/4544
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 10:52:38 +00:00
Evan Huus 6c41f5058c Qt capture interfaces dialogue string tweaks
To clarify that capturing always uses a file, the checkbox only controls whether
that file is temporary or persisted.

Change-Id: I939e1fdf488f53245166612193c60a366f63a18b
Reviewed-on: https://code.wireshark.org/review/4537
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 09:50:27 +00:00
Alexis La Goutte ceda0f9a40 Remove #pragma warning (MSVC) for PIDL generate dissector
Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
Reviewed-on: https://code.wireshark.org/review/4479
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 09:45:45 +00:00
Tomasz Moń e881036b1a Fix extcap boolean flag handling.
Change-Id: I4c6b32805d4138ef0912fbf1b129a5e97776ab9c
Reviewed-on: https://code.wireshark.org/review/4535
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-08 05:48:05 +00:00
Alexis La Goutte 41b8c6b519 DCERPC DFS: Remove from Dirty PIDL list
Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8
Reviewed-on: https://code.wireshark.org/review/4527
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08 03:43:11 +00:00
Anish Bhatt f31836dbaf [bacnet] update vendors list, fix whitespace issues, all generated via script
Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744
Reviewed-on: https://code.wireshark.org/review/4519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 02:51:54 +00:00
Lorand Jakab 65321dfb87 Add support for LISP over TCP control messages
draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control
message types using TCP transport instead of UDP (which is used by all
existing messages).  These new messages are related to each other and
are used to exchange RLOC membership information between a tunnel router
and a map server.

Bug: 10494
Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/4253
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 01:34:13 +00:00
Guy Harris d3e3cb2223 Provide an error message for WTAP_ERR_CANT_WRITE.
Change-Id: Iffc762ba60ac523148310ea2a432d4953bc64a94
Reviewed-on: https://code.wireshark.org/review/4541
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 23:23:28 +00:00
Guy Harris a566f617d8 No need for WTAP_ERR_CANT_READ.
Unlike the standard I/O routines, the code we introduced that supports
fast random seeking on gzipped files will always supply some specific
error code for read errors, so we don't need WTAP_ERR_CANT_READ.

Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
I/O routines for that.  Set errno to WTAP_ERR_CANT_WRITE before calling
fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
without setting errno.

Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
Reviewed-on: https://code.wireshark.org/review/4540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 23:19:56 +00:00
Guy Harris 5e0e4fa9e4 Replace another file_read() call with wtap_read_bytes().
Change-Id: I7b5e82c3a2fc4b4c16bf466508546558c584c150
Reviewed-on: https://code.wireshark.org/review/4539
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 22:48:57 +00:00
Guy Harris d6f217f62d Close some memory leaks for bad K12 RF5 files.
Change-Id: Ic4272a5637463fdb4d23f80d81341a0e6ea33de3
Reviewed-on: https://code.wireshark.org/review/4538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 22:07:50 +00:00
Anish Bhatt 515f09fef0 [tools] add script to automatically generate bacnet vendors
Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text

Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3
Reviewed-on: https://code.wireshark.org/review/4518
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 21:28:00 +00:00
Evan Huus cf4fc57966 ANSI683: Fix mobile country code base
Fixes error:
Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value
(FT_UINT16) but is being displayed as BASE_NONE

Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d
Reviewed-on: https://code.wireshark.org/review/4536
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 21:25:14 +00:00
Alexis La Goutte 43dffab8c8 GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10
Reviewed-on: https://code.wireshark.org/review/4526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 21:24:13 +00:00
Michael Mann a9e6c2c917 Overhaul the filterability of packet-ansi_683.c
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl.  Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector.  That started the cleanup, and I did more while in the neighborhood.

Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
Reviewed-on: https://code.wireshark.org/review/4521
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 21:14:28 +00:00
Anish Bhatt 12800157d6 [iSCSI] Fix incorrect heuristic.
The only valid check for Expected Data Transfer Length is :
R and W  MUST  NOT both be 0 when the Expected Data Transfer Length and/or
Bidirectional Read Expected Data Transfer Length are not 0

Bug #10469
Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172
Reviewed-on: https://code.wireshark.org/review/4514
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 20:53:27 +00:00
Stig Bjørlykke 683165272f asn2wrs: Added support for #.SYNTAX_NEW
This allows syntaxes to be registered as "new" dissectors.

Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce
Reviewed-on: https://code.wireshark.org/review/4524
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 20:28:10 +00:00
Stig Bjørlykke d89cc1cf9a ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()

This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).

Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4
Reviewed-on: https://code.wireshark.org/review/4531
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 20:27:35 +00:00