Commit Graph

53873 Commits

Author SHA1 Message Date
Evan Huus 5fda232659 make unit-test suite work out-of-tree
Change-Id: I638015a9b55712bb6843d6756c9c55915e142372
Reviewed-on: https://code.wireshark.org/review/2893
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12 12:08:13 +00:00
Peter Wu 9e5e43ba44 dtls: fix faulty offsets and tvbuff references
This could lead to problems for fragmented DTLS packets.

Change-Id: I602c7e181ea3799a4a2e7bcfed05bfbb129f7df4
Reviewed-on: https://code.wireshark.org/review/3017
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12 12:06:50 +00:00
Petr Štetiar ea4b2f486d dissectors/llrp: Add support for Impinj's Hub extension
Based on Impinj extension schema v1.4.

Change-Id: Ica9493a4527ae800d6e5daaf2d86b8cfdf479ed1
Signed-off-by: Petr Štetiar <petr.stetiar@gaben.cz>
Reviewed-on: https://code.wireshark.org/review/2981
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12 00:34:35 +00:00
Gerald Combs 6b898e6bbc Add back -Qunused-arguments for Clang++.
When used with ccache it can result in warnings as described at
http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.

Change-Id: Ibca4fd262ec8d1f16a450b1698ead10f57d52b06
Reviewed-on: https://code.wireshark.org/review/3015
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11 22:22:19 +00:00
Graham Bloice 8044097473 Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d
From Change: 2803

Change-Id: Ic57fb0e3c1e0450561aebe48a873a3fdb2e8e105
Reviewed-on: https://code.wireshark.org/review/3014
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-11 21:37:51 +00:00
Gerald Combs e2038e0300 Add strlen casts.
Change-Id: Icaf80f060c476dd7259c04c4cce4123025ef1dab
Reviewed-on: https://code.wireshark.org/review/3012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11 21:11:17 +00:00
Gerald Combs d1d88f575d Add plumbing for stat commands ("-z ...").
Trigger dialog creation by passing a method name to
QMetaObject::invokeMethod. I'm not entirely sure this is sane but it
seems to work OK. Move getopt processing further down in the main initialization sequence
to more closely match GTK+ and allow for stat command registration.

Change-Id: I5cd5375fa71dbadac69d528b2ba3bb13598dc3f6
Reviewed-on: https://code.wireshark.org/review/2964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11 20:52:10 +00:00
Bill Meier 14f943403a Remove $Id$
Change-Id: Iae71c6e65000471f251717a172c5f4b812ac1bd3
Reviewed-on: https://code.wireshark.org/review/3011
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11 20:04:15 +00:00
Pascal Quantin 826bca0918 GTP: allow empty Data Record Packet IE
Bug: 10277
Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364
Reviewed-on: https://code.wireshark.org/review/3008
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-11 17:55:03 +00:00
Peter Wu b3b1f7c3aa logcat: improve (crash) robustness, improve names
The logcat version detector would crash with ASAN enabled because it did
not validate the payload length and hence a payload length of 0 would
trigger out-of-bounds access. (This happened on non-logcat data.)

This patch tries to get rid of all magic numbers by using a structure,
improves the version detector to validate the payload length and
prevents crashes due to missing nul-terminators in the input. Older
Android kernels would create entries with __pad with random contents, so
that cannot be used to determine version for v1. Instead, use heuristics
on the priority, tag and maybe the msg field.

Furthermore, Android is mostly (if not, always?) Little-Endian, so add
conversions where necessary (just in case WS supports BE arches).

"microseconds" has been renamed to "milliseconds" because that is what
they are, actually. A duplicate logcat_log loop has been refactored
such that one loop is sufficient, instead of separate buffers for each
log part, a single one is now used. get_priority does not really need
a pointer, just make it accept a character.

The output has been validated against v1 and v2 logcat binary formats
with __pad (hdr_size) equal to 0, and on attachment 9906.

Change-Id: I46c8813e76fe705b293ffdee85b4c1bfff7d8362
Reviewed-on: https://code.wireshark.org/review/2803
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-07-11 13:29:25 +00:00
Michael Mann aa0eb595a0 Restore some assignments of ti2 that were removed in the proto_tree_add_subtree[_format] conversion
bug:10270
Change-Id: I40062065add1c6a08bdabc9dcbbe53afaafca035
Reviewed-on: https://code.wireshark.org/review/2997
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 07:37:05 +00:00
AndersBroman 423b5315a4 Try to fix the build.
Change-Id: I06e813db6af41d9fa4effcf2b23cf91d72c8c0ec
Reviewed-on: https://code.wireshark.org/review/2998
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 07:36:05 +00:00
Anish Bhatt bc8e095ec8 Update to fix for Bug 6302.
There is no need to check block constraints as min length already guarantees this, this also fixes false positives for missing TOS metric blocks

Change-Id: Icbe3067d2506fad1c7dbcb175d932a5f242fa5cd
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2995
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 04:39:16 +00:00
Peter Wu 71ebdb67ad ssl: move CertificateRequest to ssl-utils
Except for field/expert_info names, a redundant subtree assignment,
a different !tree check, a type confusion in DTLS (proto_tree *ti),
a check against a different DTLS/TLS version and a (void) retval cast,
the functions are exactly the same. Extract them to ssl-utils.

Change-Id: I2ca7089fe2cd23212ef78656506cb53768f55927
Reviewed-on: https://code.wireshark.org/review/2986
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 04:36:51 +00:00
Peter Wu ba6d2e7cc8 ssl: move Certificate handshake dissection to ssl-utils
There are no dissection differences between DTLS and SSL, so move to
ssl-utils. While at it, skip dissection when the tree is NULL, remove
the plural from certificates length (the length is always larger than
ome), fix type of "ti" for dtls, get rid of "failsafe" subtree
assignment in ssl, get rid of tvb_ensure_bytes_exist in ssl.

Unrelated changes: fix param (tvb vs sub_tvb) for DTLS KeyExchange
handshake messages.

Change-Id: Iecaa45a7a601e55a52aa16180cf219a122fbe95a
Reviewed-on: https://code.wireshark.org/review/2985
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 04:35:40 +00:00
Peter Wu 7248c24afc ssl: add missing valid handshake types
The DTLS dissector duplicated a handshake types check, this has been
eliminated. Convert HandshakeType and ContentType to enums to get the
benefit of compiler-checked switch cases. Move these checks to
ssl-utils.

Two default cases could never be reached since the dissector returns
immediately on an invalid ContentType.

Also fixed misleading debugging messages.

Change-Id: I07a2062564e073004dcc0401cd82538e5659fa0c
Reviewed-on: https://code.wireshark.org/review/2978
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 04:32:15 +00:00
Irene Ruengeler c7b45d0a7d GTK Remote Capturing
Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too.

Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760
Reviewed-on: https://code.wireshark.org/review/2955
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11 04:29:46 +00:00
Bill Meier 9ed99d5c4e Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.
Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11 03:20:54 +00:00
Guy Harris d96ff60566 As opposed to *loudly* silently?
Change-Id: I5c6843ac2c665a4c8c8822084377fee661405d34
Reviewed-on: https://code.wireshark.org/review/2992
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11 00:44:51 +00:00
Guy Harris 2585e6cb09 Change comments to reflect current reality.
Change-Id: If4e220457d2040eaa35dd5e55a0f43fc9da5e347
Reviewed-on: https://code.wireshark.org/review/2991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11 00:43:15 +00:00
Guy Harris b5d4128bee Avoid sign-extending bytes before handing them to <ctype.h> macros.
Pointed out by the Visual Studio code analyzer.

Change-Id: Idd429b4d0fb3db11ce171c3a5b38bdc55cc53c15
Reviewed-on: https://code.wireshark.org/review/2988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-11 00:28:36 +00:00
AndersBroman 96f0585268 Quick fix to handle IEPS token.
Fix deorecated APIs

Change-Id: Iad1f970b553f1655109b36364a1d37676582f608
Reviewed-on: https://code.wireshark.org/review/2984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10 14:48:08 +00:00
Alexis La Goutte a7fb1e5c53 Fix Uninitialized argument value found by Clang Analyzer
Change-Id: I3cdb7734302b3e879def71dfa48c4654999ae9d2
Reviewed-on: https://code.wireshark.org/review/2983
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10 13:34:03 +00:00
AndersBroman 09785b34d4 I don't see the point of inserting p_proto_data sorted use
g_slist_prepend().
While there fix deprecated API.

Change-Id: Id5241348927d904d859530fac3f43f2b301a1acb
Reviewed-on: https://code.wireshark.org/review/2982
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-10 12:28:27 +00:00
Graham Bloice 4e64448f09 Fix a small typo in the FindChocolatey.cmake module
Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb
Reviewed-on: https://code.wireshark.org/review/2980
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-10 11:44:09 +00:00
Peter Wu 1bf4efd850 ssl,dtls: convert from tvb_length
Every occurrence of tvb_length* has been converted to
tvb_reported_length* except some dtls lines.

Change-Id: I0faac315cdf5d17c0af18be177aacd076ff86cff
Reviewed-on: https://code.wireshark.org/review/2977
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-10 11:00:11 +00:00
Pascal Quantin e1bad3cd9b Remove a useless line now that nghttp2 library has moved to /epan
Change-Id: I41c876620e691f2e217fc9249d6abae01ea81b7f
Reviewed-on: https://code.wireshark.org/review/2975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-10 07:31:03 +00:00
Michael Mann e6c87fe6b1 convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10 01:51:21 +00:00
Guy Harris 9b182b7097 Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."
This reverts commit c5a50df51f.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2
Reviewed-on: https://code.wireshark.org/review/2973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10 00:59:31 +00:00
Guy Harris ea721b8938 Revert "More needed to get rid of "lib" in "libwsutil" on Windows."
This reverts commit 28719a4e4e.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a
Reviewed-on: https://code.wireshark.org/review/2972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10 00:59:07 +00:00
Guy Harris b1c9d0fafe Revert "A few more changes to remove "lib" from "libwsutil" on Windows."
This reverts commit 2fbedef5d1.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I88245c046b1cf1c76c73fc8e4bc13868e0df4e44
Reviewed-on: https://code.wireshark.org/review/2971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10 00:58:37 +00:00
Guy Harris 2fbedef5d1 A few more changes to remove "lib" from "libwsutil" on Windows.
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451
Reviewed-on: https://code.wireshark.org/review/2970
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09 23:44:01 +00:00
Guy Harris 28719a4e4e More needed to get rid of "lib" in "libwsutil" on Windows.
Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9
Reviewed-on: https://code.wireshark.org/review/2969
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09 23:29:43 +00:00
Guy Harris c5a50df51f See if we can get rid of the "lib" in front of "wsutil" on Windows.
"libXXX" is a UN*X convention; see whether we can do without it on
Windows.

Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85
Reviewed-on: https://code.wireshark.org/review/2968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09 23:23:47 +00:00
Britt McKinley b2bf078d52 h264: Remove unneeded errata checks.
Some Microsoft errata were caused by bad decoding and were not actually
problems.  Remove the unneeded tests and expert information.
Add PRID ranges values to Layer Presence bytes.

Change-Id: I0b2b555bc448f0b4ee142b2920ae4e37d54ccab4
Reviewed-on: https://code.wireshark.org/review/2958
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09 22:37:14 +00:00
Gerald Combs bb9a25177c Add back actionFileQuit.
Change-Id: I76cfe038c02a869fb71dc74b7c55fd932e2ccbb2
Reviewed-on: https://code.wireshark.org/review/2967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-09 22:05:51 +00:00
Gerald Combs da3634a01f Fix a "recent items" crash.
Use a QMutableListIterator instead of a foreach loop so that we can
safely remove items from a list.

While we're here, make sure that RecentFileStatus threads use a
Qt::QueuedConnection when emitting signals across threads and try to
isolate the filename string.

Change-Id: I3fbb65a1727133f4557026decab5084a3faec2d4
Reviewed-on: https://code.wireshark.org/review/2966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-09 21:39:41 +00:00
Sean O. Stalley cdc1c16bb7 Print wIndex in decimal and hex
wIndex often contains different fields in it's upper & lower byte.
Printing in hex makes these seperate fields easier to read.

Change-Id: I69fb7e14b4f5b5a1ecd61bcae34f6d100f1a94b6
Reviewed-on: https://code.wireshark.org/review/2961
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09 21:01:59 +00:00
Alexis La Goutte 813aa93510 Cmake : (Find XLST Proc) fix indent (use 4spaces)
Change-Id: Ic8abdc9aaae899dcc5d870bc023c52dc7a2bbfe6
Reviewed-on: https://code.wireshark.org/review/2952
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09 19:30:04 +00:00
Alexis La Goutte a93d2eaef5 CMake : Set html viewer exe path in HTML_VIEWER variable (and no set or unset..), autotools only add exe name
Change-Id: I552ef5d20fc80d341ce97da76b665e97df856d18
Reviewed-on: https://code.wireshark.org/review/2951
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09 19:29:46 +00:00
Alexis La Goutte 2cb5937ebb CMake : fix name of HTML Viewer to display also the exe path
Change-Id: Id103ced59e0ae7e2cff272604f4cfe11d47fe957
Reviewed-on: https://code.wireshark.org/review/2950
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09 19:29:41 +00:00
Pascal Quantin 9f3c429929 MAC LTE: interpret RAR TPC command
Change-Id: I4e44124d5634e570917730084619e138a6e534af
Reviewed-on: https://code.wireshark.org/review/2963
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-09 18:04:57 +00:00
Pascal Quantin 4418986933 HDMI: remove useless include
Change-Id: Ia575fc8f3e80666a13dbc54220aa3931a1c505f0
Reviewed-on: https://code.wireshark.org/review/2962
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-09 18:03:14 +00:00
Evan Huus 72e15f22ea Merge capture->interfaces and capture->options
Change-Id: I0a2976da97bd777abbf4701915551d9d481b0a13
Reviewed-on: https://code.wireshark.org/review/2785
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09 12:34:45 +00:00
Graham Bloice 4b5967f683 Moved nghttp2 to epan
Cleaned up nghttp2 build

Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d
Reviewed-on: https://code.wireshark.org/review/2937
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-09 05:31:31 +00:00
Alexis La Goutte 5f0fd977d1 Wireshark Qt: Fix recent (update the list of file when quit Wireshark)
Change-Id: I2fac5178fca9675ffb70a942d094335323358d22
Reviewed-on: https://code.wireshark.org/review/2825
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-09 04:34:53 +00:00
Michael Mann 6691293a65 convert to proto_tree_add_subtree[_format]
Change-Id: I8d66b1bc7dbdfee3d4bf6fd3b3c21c6323b66f44
Reviewed-on: https://code.wireshark.org/review/2946
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-09 00:25:04 +00:00
Pascal Quantin cfee2019c6 LTE RRC: upgrade dissector to v11.8.0
Change-Id: I2bb0861029d0d30ae372b0b8085fbedeb4932217
Reviewed-on: https://code.wireshark.org/review/2949
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-08 22:06:46 +00:00
Bill Meier b66f614e5d pre-commit: Add 'unset GREP_OPTIONS' (similar to Gerrit commit-msg)
msysgit grep is fairly old and doesn't recognize certain
  grep options, e.g., '--color=auto'.

  I imagine there may possibly be other grep option issues
  on various platforms.

  (I also note that the various git scripts in libexec/git-core
   clear out GREP_OPTIONS before calling grep).

Change-Id: I67bc148a77cfc0167064e61e8c47a5f091704eac
Reviewed-on: https://code.wireshark.org/review/2945
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-08 20:00:52 +00:00
Yan Burman 17872b57e9 Fix setting PT_IBQP type
Without this patch, pinfo->ptype is PT_UNKNOWN

Change-Id: Ia15b5115f874d0c9ff69be11ed7ee3dac1fadbd5
Signed-off-by: Yan Burman <yanb@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/2941
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-08 15:18:17 +00:00