Commit graph

55288 commits

Author SHA1 Message Date
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
Michał Orynicz
47a1735ca1 Add proper decoding for type field in OBEX headers
Change type field type from byte sequence to string.

Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee
Reviewed-on: https://code.wireshark.org/review/4417
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 20:14:19 +00:00
Guy Harris
71550ba98a Make the code a bit more like the pre-new-APIs code.
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5
Reviewed-on: https://code.wireshark.org/review/4534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 19:50:08 +00:00
Gerald Combs
d98debe6d0 1.99.0 → 1.99.1.
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 19:41:19 +00:00
Gerald Combs
9033f137a9 Revert "ASN1: Added support for using #.REGISTER_NEW"
This temporarily reverts commit
acc09c2aa2.

Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0
Reviewed-on: https://code.wireshark.org/review/4525
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 16:34:18 +00:00
Stig Bjørlykke
acc09c2aa2 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: I8802a812bd484c1e8794c618b87e676003aea94a
Reviewed-on: https://code.wireshark.org/review/4493
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 16:23:55 +00:00
Gerald Combs
a87659c530 Build 1.99.0.
Change-Id: Idc813297e5e27680b13a6b81adcf18ae4ef4d4e4
Reviewed-on: https://code.wireshark.org/review/4523
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 16:16:23 +00:00
Richard Sharpe
15e89ecdfa Dissect an SVHDX Open Device Context that appears as an Extra Create Parameter
in a CREATE request. This helps understand HyperV over SMB 3.x stuff.

Bug: 10527
Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-on: https://code.wireshark.org/review/4477
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 15:10:35 +00:00
Guy Harris
4611b8d485 Make the code a bit more like the pre-API change code.
Change-Id: I9a8bd2c7ce97993c1b72caf63254d024950f8b94
Reviewed-on: https://code.wireshark.org/review/4520
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 08:05:52 +00:00
Martin Kaiser
8439fd5796 - Handle strings that have an opening but no closing quote
fixes the endless loop reported in

Bug: 10521

- Fix a typo.
Change-Id: I17b4a15e780d1d6122841a308348518063f82a59
Reviewed-on: https://code.wireshark.org/review/4467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 07:49:13 +00:00
Guy Harris
05d34b3ca1 Clean up white space.
Change-Id: I73f2406483c13c7917faed46db6fc1f5e2bc8fcd
Reviewed-on: https://code.wireshark.org/review/4517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 07:40:27 +00:00
Guy Harris
3f101f2b3f Fix a comment, clean up some whitespace.
Change-Id: I5d3d518eee2d61dd896b44c2a61d66057f3c2f7f
Reviewed-on: https://code.wireshark.org/review/4516
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 07:35:43 +00:00
Anish Bhatt
04bca658f9 [bacnet] update vendor list
Change-Id: I6b7bd3b3a110b8d393cd849c12890fff17446e54
Reviewed-on: https://code.wireshark.org/review/4515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-07 06:44:43 +00:00
Guy Harris
ffd48cefa6 Whitespace cleanups.
Change-Id: I92f983b2e04defab30eb31c14c484b9f0f582413
Reviewed-on: https://code.wireshark.org/review/4513
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 05:01:39 +00:00
Alexis La Goutte
683d657d49 PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer
packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined
packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined
packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined
packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined
packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value
packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f
Reviewed-on: https://code.wireshark.org/review/4478
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 01:13:06 +00:00
Alexis La Goutte
de13887198 idl2wrs (DCERPC DRSUAPI): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Add a check if the struct is not empty

budb and butc are also regenerate but no change

Change-Id: I0d8cfc827f5451f1cdbd924628a263af9d483a7b
Reviewed-on: https://code.wireshark.org/review/4473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 01:12:22 +00:00
Guy Harris
670ebda4a6 Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.

Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.

Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.

Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:01:59 +00:00
Gerald Combs
6397ad43c2 Revert "Qt: Try to fix a Visual C++ encoding warning."
Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch
Visual C++ instead.

Qt's rich text renderer doesn't handle "&apos;". Replace it with "&#x27;".
Remove a QDebug include.

Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b
Reviewed-on: https://code.wireshark.org/review/4511
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06 23:34:56 +00:00
Gerald Combs
a17067abb1 Qt: Rename the "check for updates" slot.
The "Check for Updates..." action doesn't exist when
QMetaObject::connectSlotsByName is called. Rename
on_actionHelpCheckForUpdates_triggered to checkForUpdates so that we
don't get the warning

QMetaObject::connectSlotsByName: No matching signal for on_actionHelpCheckForUpdates_triggered()

at startup.

Change-Id: Icbd7eb98731023c323212e6ec3d3c98f1321e245
Reviewed-on: https://code.wireshark.org/review/4510
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06 22:59:40 +00:00
Martin Kaiser
0644b34067 after an lupdate, I should also do an lrelease to keep the .ts file and
the .qm file in sync

Change-Id: I588f5ff7386bac13c8ce0bba82fee4807c490682
Reviewed-on: https://code.wireshark.org/review/4509
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-06 22:05:02 +00:00