jlayton/wireshark.git
7 years agoFix "disable this protocol by default". master
Guy Harris [Thu, 23 Jun 2016 19:45:32 +0000 (12:45 -0700)]
Fix "disable this protocol by default".

Allow a dissector to mark its protocol as "disabled by default", which
means that the "enable all protocols" routine won't enable it.  This is
necessary in order to allow the disabling of protocols not to be
unintentionally changed due to profile changes; see bug 9826.

Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f
Ping-Bug: 9826
Reviewed-on: https://code.wireshark.org/review/16109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoLTE RRC: fix display of info column when receiving a BR SIB
Pascal Quantin [Thu, 23 Jun 2016 14:10:09 +0000 (16:10 +0200)]
LTE RRC: fix display of info column when receiving a BR SIB

Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0
Reviewed-on: https://code.wireshark.org/review/16098
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agopacket-nfs: add extent decoding for SCSI layouts
Benjamin Coddington [Thu, 23 Jun 2016 09:57:03 +0000 (05:57 -0400)]
packet-nfs: add extent decoding for SCSI layouts

Decode extents sent within the response to a LAYOUTGET operation on
SCSI layout types.

Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16097
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>
7 years agoNASA provided LTP and DTN updates
dz-msfc [Thu, 3 Mar 2016 02:39:12 +0000 (20:39 -0600)]
NASA provided LTP and DTN updates

Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
Reviewed-on: https://code.wireshark.org/review/14310
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>
7 years agoIncrease MAX_DISSECTOR_ADDR_TYPE.
Jens Kilian [Thu, 23 Jun 2016 08:31:42 +0000 (10:31 +0200)]
Increase MAX_DISSECTOR_ADDR_TYPE.

With the recent changes causing some address types to be registered
by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE
limit in a new dissector I'm currently writing.

Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee
Reviewed-on: https://code.wireshark.org/review/16091
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agobthci: add missing break (CID 1362832)
Dario Lombardo [Thu, 23 Jun 2016 08:13:15 +0000 (10:13 +0200)]
bthci: add missing break (CID 1362832)

Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0
Reviewed-on: https://code.wireshark.org/review/16090
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoFix some of the brokenness in the PRP redundancy control trailer dissector.
Guy Harris [Thu, 23 Jun 2016 09:33:46 +0000 (02:33 -0700)]
Fix some of the brokenness in the PRP redundancy control trailer dissector.

IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET
YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR
THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET
BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE
CAPTURE.

THERE ARE NO EXCEPTIONS TO THIS RULE.

Bug: 9826
Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9
Reviewed-on: https://code.wireshark.org/review/16092
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoNo pcap, no live capture, so no auto_scroll_live.
Guy Harris [Thu, 23 Jun 2016 08:00:26 +0000 (01:00 -0700)]
No pcap, no live capture, so no auto_scroll_live.

Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d
Reviewed-on: https://code.wireshark.org/review/16088
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoQt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).
Dario Lombardo [Mon, 13 Jun 2016 18:02:46 +0000 (20:02 +0200)]
Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).

This change is useful to use the offline mode in tests (like fuzzing)
that require the software to quit after the processing of a sample.

Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02
Reviewed-on: https://code.wireshark.org/review/16038
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd LACP "flag strings"
Michael Mann [Thu, 23 Jun 2016 04:30:51 +0000 (00:30 -0400)]
Add LACP "flag strings"

Merged the functionality of a Lua script from Sharkfest '16
presentation into the dissector.
Also cleaned up some of the tfs values used by the dissector.

Bug: 12550
Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c
Reviewed-on: https://code.wireshark.org/review/16086
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoZigBee updated ZDO support to comply with R22
Chris Brandson [Fri, 17 Jun 2016 22:12:12 +0000 (15:12 -0700)]
ZigBee updated ZDO support to comply with R22

Update ZDO support for R22 (and IEEE 802.15.4-2015)
- Add support for the new IEEE Joining List request / response
- Changed Network Update to support channel pages
- Added Network Update Enhanced request
- Added decoding of EU Sub-GHz Frequency Band

Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e
Reviewed-on: https://code.wireshark.org/review/16040
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoIPv6: Don't check payload length for ICMPv6 encapsulation
João Valverde [Wed, 22 Jun 2016 20:10:50 +0000 (21:10 +0100)]
IPv6: Don't check payload length for ICMPv6 encapsulation

Change-Id: I783df2ddc98da1c78020837a32005ea143321990
Reviewed-on: https://code.wireshark.org/review/16081
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoSquelch some 64-bit-to-32-bit-shortening warnings.
Guy Harris [Thu, 23 Jun 2016 04:29:20 +0000 (21:29 -0700)]
Squelch some 64-bit-to-32-bit-shortening warnings.

Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f
Reviewed-on: https://code.wireshark.org/review/16085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoQt: Use queued signals+slots for filter actions
Gerald Combs [Wed, 22 Jun 2016 19:44:02 +0000 (12:44 -0700)]
Qt: Use queued signals+slots for filter actions

Many of our dialogs can send an "apply this display filter" signal to
the main window. Applying a display filter in turn creates a nested
event loop via cf_read+update_progress_dlg. If the "apply" signal+slot
is directly connected (which is the default, and which means we're
calling into a function table) we can close the dialog while the signal
is firing, which means we return into a deleted object.

Make all of the filterAction signals+slots queued instead of direct.

Bug: 12523
Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292
Reviewed-on: https://code.wireshark.org/review/16080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoHTTP: Split URI into path and query. Tokenize parameters.
Uli Heilmeier [Thu, 16 Jun 2016 12:03:04 +0000 (14:03 +0200)]
HTTP: Split URI into path and query. Tokenize parameters.

Split a HTTP URI into path and query.
Tokenize the parameters of a query.

Bug: 12514
Change-Id: I9892914eba9737c9751936ce62e63497aba61c61
Reviewed-on: https://code.wireshark.org/review/15971
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoRTP player: increase the maximum number of silence frames to 30 minutes worth.
Jeff Morriss [Sat, 18 Jun 2016 00:41:31 +0000 (20:41 -0400)]
RTP player: increase the maximum number of silence frames to 30 minutes worth.

The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as
low as it was) has long since been fixed thanks to
bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with
more silence frames.

Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335
Ping-Bug: 5902
Ping-Bug: 4119
Ping-Bug: 2270
Reviewed-on: https://code.wireshark.org/review/16003
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: Support the -j, -J, and -l command line flags
Gerald Combs [Wed, 22 Jun 2016 21:41:16 +0000 (14:41 -0700)]
Qt: Support the -j, -J, and -l command line flags

Add support for -j, -J, and -l. Mark the -m flag deprecated.

Bug: 12546
Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6
Reviewed-on: https://code.wireshark.org/review/16083
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoEditcap: Fix setting of max_packet_number
John A. Thacker [Mon, 20 Jun 2016 20:29:49 +0000 (16:29 -0400)]
Editcap: Fix setting of max_packet_number

editcap -r only sets max_packet_number to the earliest, instead of latest,
packet or end of range selection. This changes it to the proper test.

Bug: 12547
Change-Id: I81772962b00fc6566ccead4fb44c6626a47fff31
Reviewed-on: https://code.wireshark.org/review/16045
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoWindows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll
Pascal Quantin [Tue, 21 Jun 2016 13:31:39 +0000 (15:31 +0200)]
Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll

This aligns the name with what is done for other Wireshark shared libraries.
Moreover it allows to compile a wiretap plugin once per major release, without
the need to recompile it each time ${PROJECT_VERSION} changes (each nightly
build / official release).

Change-Id: I53c82277223a4f323079cf695168ac85c2fba523
Reviewed-on: https://code.wireshark.org/review/16058
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoDon't close Wireshark (GTK) if user cancels Save on Close.
Michael Mann [Wed, 22 Jun 2016 05:28:48 +0000 (01:28 -0400)]
Don't close Wireshark (GTK) if user cancels Save on Close.

Bug: 9635
Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa
Reviewed-on: https://code.wireshark.org/review/16075
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoDon't close Wireshark (Qt) if user cancels Save on Close.
Michael Mann [Wed, 22 Jun 2016 14:56:07 +0000 (10:56 -0400)]
Don't close Wireshark (Qt) if user cancels Save on Close.

Bug: 9635
Change-Id: I8c73c839419cd4bcb850824ffb42bf72eed50b19
Reviewed-on: https://code.wireshark.org/review/16076
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoHandle ENAMETOOLONG.
Gerald Combs [Mon, 20 Jun 2016 16:41:10 +0000 (09:41 -0700)]
Handle ENAMETOOLONG.

g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves.

Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40
Reviewed-on: https://code.wireshark.org/review/16041
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoNo GeoIP, no need for geoip_none_.
Guy Harris [Wed, 22 Jun 2016 23:26:56 +0000 (16:26 -0700)]
No GeoIP, no need for geoip_none_.

Change-Id: I6fb328d07718d2ff7a7d6008c936b7478ea6db3f
Reviewed-on: https://code.wireshark.org/review/16084
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoQt: Fix crash in Conversations and Endpoints dialogs
Gerald Combs [Wed, 22 Jun 2016 17:56:30 +0000 (10:56 -0700)]
Qt: Fix crash in Conversations and Endpoints dialogs

Don't assume that conv_item_t or hostlist_talker_t pointers never
change. GArrays can reallocate their data, and in our case this can
happen when we have more than 10,000 items (which is the size that the
conversation table code passes to_array_sized_new).

Bug: 12288
Change-Id: I88e58be830e35dde272f81fe9250b054fb87facf
Reviewed-on: https://code.wireshark.org/review/16078
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoSSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 22 Jun 2016 19:08:57 +0000 (21:08 +0200)]
SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15
Reviewed-on: https://code.wireshark.org/review/16079
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Kenny Root <kenny@the-b.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: Make the syntax line edit less greedy.
Gerald Combs [Tue, 21 Jun 2016 23:23:04 +0000 (16:23 -0700)]
Qt: Make the syntax line edit less greedy.

In SyntaxLineEdit::event, only grab ShortcutOverride events that have
Ctrl+Alt modifiers. When the main window display filter edit has focus
this should let us use text editing shortcuts and most main window
shorcuts as appropriate. "Most" means everything except for time display
formats. We might want to use something other than Ctrl+Alt for their
modifiers.

Bug: 12533
Ping-Bug: 12270
Change-Id: I61eb86b80b4237e6907d5e50262b8f5c291b27a7
Reviewed-on: https://code.wireshark.org/review/16065
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoGTK: Keep display filter applied when switching profiles
Balint Reczey [Thu, 16 Jun 2016 22:09:56 +0000 (15:09 -0700)]
GTK: Keep display filter applied when switching profiles

Bug: 6130
Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca
Reviewed-on: https://code.wireshark.org/review/15992
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd address_to_bytes API.
Michael Mann [Wed, 22 Jun 2016 02:23:05 +0000 (22:23 -0400)]
Add address_to_bytes API.

This will copy an address's "byte format" into a buffer.  The original
intended design is for export_pdu functionality, which tries to do
this "manually" for many address types (and creates undesired dependencies)

The default functionality if a "byte format function" isn't provided
(currently the case for all address types) is a memcpy of the address
data.  Providing "address to byte" functions to aid export PDU
functionality will be provided later.

Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b
Reviewed-on: https://code.wireshark.org/review/16070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQt: Clear the packet list selection before freezing it.
Gerald Combs [Tue, 21 Jun 2016 22:13:30 +0000 (15:13 -0700)]
Qt: Clear the packet list selection before freezing it.

Call selectionModel()->clear() before removing our model. This will
hopefully make sure we don't end up with an invalid selection in
selectionChanged().

Clear the selection model before clearing the model while we're here.

Change-Id: I1007eeaa480afa0fb31dafc15a49ca6c247b30c8
Reviewed-on: https://code.wireshark.org/review/16062
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Kenny Root <kenny@the-b.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoMove AT_VINES address type to VINES dissector.
Michael Mann [Wed, 22 Jun 2016 00:30:35 +0000 (20:30 -0400)]
Move AT_VINES address type to VINES dissector.

proto.c still has to deal with FT_VINES, but maybe that
can be refactored to the dissector too.

Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3
Reviewed-on: https://code.wireshark.org/review/16069
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoMove AT_USB to inside USB dissector.
Michael Mann [Wed, 22 Jun 2016 00:06:01 +0000 (20:06 -0400)]
Move AT_USB to inside USB dissector.

This required some hacking in the conversation table handling, but
still seemed worth it as USB address is not widely used.
Maybe a "is_stringlike" property for address types...

Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a
Reviewed-on: https://code.wireshark.org/review/16068
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoThe C standard requires <stdlib.h> for getenv() and abort().
Guy Harris [Tue, 21 Jun 2016 23:34:36 +0000 (16:34 -0700)]
The C standard requires <stdlib.h> for getenv() and abort().

You might be able to get away with not including it on some or all
UN*Xes, but you can't do so on Windows with MSVC.

Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69
Reviewed-on: https://code.wireshark.org/review/16064
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMore helpful failure when registration fails.
Joerg Mayer [Tue, 21 Jun 2016 22:23:38 +0000 (00:23 +0200)]
More helpful failure when registration fails.

Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280
Reviewed-on: https://code.wireshark.org/review/16063
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agoAs with dissector_add_uint(), so with dissector_add_{string,guid}.
Guy Harris [Tue, 21 Jun 2016 18:21:33 +0000 (11:21 -0700)]
As with dissector_add_uint(), so with dissector_add_{string,guid}.

Improve the error message for a null disssector handle.

Fix indentation while we're at it.

Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0
Reviewed-on: https://code.wireshark.org/review/16060
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoSlightly improve error message in case of initialization errors.
Joerg Mayer [Tue, 21 Jun 2016 17:56:00 +0000 (19:56 +0200)]
Slightly improve error message in case of initialization errors.

Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3
Reviewed-on: https://code.wireshark.org/review/16059
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agotshark JSON and Elasticsearch output fix
Martin Kacer [Mon, 20 Jun 2016 09:03:40 +0000 (11:03 +0200)]
tshark JSON and Elasticsearch output fix

Fixed json and ek escape function
Fixed -j protocol filter to do exact match
Fixed -T json to correctly close json
Added -j protocol filter also to pdml output

Bug: 11754
Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea
Reviewed-on: https://code.wireshark.org/review/16034
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agolibcodecs and libwsutil are DLLs, not static libraries
Pascal Quantin [Tue, 21 Jun 2016 13:30:33 +0000 (15:30 +0200)]
libcodecs and libwsutil are DLLs, not static libraries

Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964
Reviewed-on: https://code.wireshark.org/review/16057
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoAdd a couple of vendor defines.
AndersBroman [Tue, 21 Jun 2016 13:20:16 +0000 (15:20 +0200)]
Add a couple of vendor defines.

Change-Id: I252b4f892a539c7fa585615ef636fc26de356bf7
Reviewed-on: https://code.wireshark.org/review/16055
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years ago[H248-Q1950] Correct signal ids.
AndersBroman [Tue, 21 Jun 2016 13:14:48 +0000 (15:14 +0200)]
[H248-Q1950] Correct signal ids.

Change-Id: Iafb030313ed3b715a09146d131dfb4ffdcb7961a
Reviewed-on: https://code.wireshark.org/review/16054
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agopcap: ERF per-Host ID/Source ID interface support
Anthony Coddington [Tue, 5 Apr 2016 02:21:36 +0000 (14:21 +1200)]
pcap: ERF per-Host ID/Source ID interface support

Add encap_priv pointer to libpcap_t.
Initialize erf_priv when ENCAP_ERF.
Use erf_populate_interface_from_header() to dynamically create interfaces.
Free encap_priv on pcap_close.

Ping-Bug: 12303
Change-Id: Ieda425ef3e50a124d9c38ee4538aa3644128ce60
Reviewed-on: https://code.wireshark.org/review/15362
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agopcap: Add support to "new" Npcap native mode without setting PATH
Yang Luo [Thu, 16 Jun 2016 03:39:32 +0000 (11:39 +0800)]
pcap: Add support to "new" Npcap native mode without setting PATH

Npcap decided not to add "C:\Windows\System32\Npcap" to
system PATH in the installation any more (starting from
Npcap 0.07 r14). So this patch needs to be applied, otherwise
Wireshark will not find Packet.dll (the error message will
only say wpcap.dll is missing, but actually is Packet.dll
missing).

Change-Id: Ifd8b6e6d8ecf9866cd37c3368b604de210ff8c7b
Reviewed-on: https://code.wireshark.org/review/15959
Reviewed-by: Yang Luo <hsluoyz@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agobthci: Show unknown ocf as undecoded
Stig Bjørlykke [Tue, 21 Jun 2016 06:55:14 +0000 (08:55 +0200)]
bthci: Show unknown ocf as undecoded

Don't show unknown ocf values as unexpected parameters.

Change-Id: I08a6c8c20d6382a847f0a2969e4c523a2873dd6f
Reviewed-on: https://code.wireshark.org/review/16048
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agopacketlogger: Add some info types
Stig Bjørlykke [Tue, 21 Jun 2016 06:52:51 +0000 (08:52 +0200)]
packetlogger: Add some info types

Add Kernel, Kernel Debug and Error info types.

Change-Id: I04547a426b69adde5186e8315a08f4648c1e7837
Reviewed-on: https://code.wireshark.org/review/16047
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agodebian-setup: add additional params to apt-get.
Dario Lombardo [Fri, 17 Jun 2016 17:30:57 +0000 (19:30 +0200)]
debian-setup: add additional params to apt-get.

Can be used to pass params like -qq and -y for automated installations,
like in travis-ci.

Change-Id: Iddf18829f09ce6b16c1c71264adab38d0a893fe6
Reviewed-on: https://code.wireshark.org/review/15999
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
7 years agoCheck for negative nanoseconds in io,stat tap.
Michael Mann [Tue, 21 Jun 2016 05:19:47 +0000 (01:19 -0400)]
Check for negative nanoseconds in io,stat tap.

Seconds were already being checked for negative values, but if there is
only a fraction of a second, the negative check wasn't being done,
which led to bad results.

Bug: 9014
Change-Id: I820e0a4b1384330acebf4a632a04f7840db2288b
Reviewed-on: https://code.wireshark.org/review/16046
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoceph: c_dissect_sockaddr doesn't need the "data" pointer
Jeff Layton [Mon, 20 Jun 2016 19:10:32 +0000 (15:10 -0400)]
ceph: c_dissect_sockaddr doesn't need the "data" pointer

Change-Id: I8d4ca2e46a556e32e594610fd26c72840783601e
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16042
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd support for Opencontrail virtual network
Rudra Rugge [Wed, 15 Jun 2016 18:32:57 +0000 (11:32 -0700)]
Add support for Opencontrail virtual network

Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83
Reviewed-on: https://code.wireshark.org/review/15930
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years ago[RNSAP]Update to V13.1.0 (2015-12)
AndersBroman [Wed, 13 Jan 2016 16:49:43 +0000 (17:49 +0100)]
[RNSAP]Update to V13.1.0 (2015-12)

Change-Id: I6cb7099ac691d68ddae7be59bf37130c8affad42
Reviewed-on: https://code.wireshark.org/review/13263
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years ago[pre-commit-ignore] Dont check the asn1 files they are imported verbatime
AndersBroman [Mon, 20 Jun 2016 11:57:11 +0000 (13:57 +0200)]
[pre-commit-ignore] Dont check the asn1 files they are imported verbatime
from standards documents in most cases.

Change-Id: Ie9db1a1431a201dc374f800b5118a199dcb51b9c
Reviewed-on: https://code.wireshark.org/review/16035
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoPull the options structure initialization into commandline_other_options().
Guy Harris [Mon, 20 Jun 2016 06:54:33 +0000 (23:54 -0700)]
Pull the options structure initialization into commandline_other_options().

Change-Id: I931cde27a81566dfa0ce6e5c9307bfc1a4d5fe54
Reviewed-on: https://code.wireshark.org/review/16033
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoAdd display filter completion suggestions to color filters.
Michael Mann [Sun, 19 Jun 2016 21:53:59 +0000 (17:53 -0400)]
Add display filter completion suggestions to color filters.

Change-Id: I84d890b55c72e4427ceb2d64e4a7888c07c030f5
Reviewed-on: https://code.wireshark.org/review/16024
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd field completion suggestions when adding a Display filter or Y Field to the IO...
Michael Mann [Sun, 19 Jun 2016 21:47:27 +0000 (17:47 -0400)]
Add field completion suggestions when adding a Display filter or Y Field to the IO Graph

Bug: 11899
Change-Id: I7cee36581dc773daa691dad10500124ab66520bc
Reviewed-on: https://code.wireshark.org/review/16023
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoGTK+: Truncate simple_message_box messages.
Gerald Combs [Sat, 18 Jun 2016 19:13:15 +0000 (12:13 -0700)]
GTK+: Truncate simple_message_box messages.

In do_simple_message_box, build our primary message using
g_string_vprintf instead of g_strdup_vprintf. Truncate both the primary
and secondary messages so that we end up with merely annoyingly wide
dialogs instead of insanely wide ones.

Bug: 9761
Change-Id: I93ff76344c0da7d97cce5180ed9ecf9349190f6f
Reviewed-on: https://code.wireshark.org/review/16005
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoqt: reset the column sorting when a new file is loaded
Martin Kaiser [Fri, 17 Jun 2016 20:43:20 +0000 (13:43 -0700)]
qt: reset the column sorting when a new file is loaded

Bug: 12541
Change-Id: I75656d4027dd39e1f97c4bcd38e0dea6fe2de297
Reviewed-on: https://code.wireshark.org/review/16002
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd JSON export to Qt/GTK UI
Pascal Quantin [Sun, 19 Jun 2016 14:52:50 +0000 (16:52 +0200)]
Add JSON export to Qt/GTK UI

Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a
Reviewed-on: https://code.wireshark.org/review/16013
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoProtect some code that's only for Wireshark-with-pcap.
Guy Harris [Mon, 20 Jun 2016 00:42:14 +0000 (17:42 -0700)]
Protect some code that's only for Wireshark-with-pcap.

Put that code inside #ifdef HAVE_LIBPCAP/#endif.

Change-Id: I85768fd49a008341a95ac3c8656e96afa6741fbe
Reviewed-on: https://code.wireshark.org/review/16030
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMove some option checking to common code.
Guy Harris [Sun, 19 Jun 2016 23:36:57 +0000 (16:36 -0700)]
Move some option checking to common code.

Change-Id: Icff9dacd73ea933c59ed664db05098dd8cb3dbf5
Reviewed-on: https://code.wireshark.org/review/16029
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDon't assume we successfully read the configuration files.
Guy Harris [Sun, 19 Jun 2016 22:28:39 +0000 (15:28 -0700)]
Don't assume we successfully read the configuration files.

read_configuration_files() can fail and return NULL, so check that
commandline_info.prefs_p is non-null before dereferencing it.

Fixes CID 1362778.

Change-Id: I3066769c474d394fbfe548b50d6be704964e59d3
Reviewed-on: https://code.wireshark.org/review/16028
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDon't assume we have an array of GeoIP databases.
Guy Harris [Sun, 19 Jun 2016 22:18:00 +0000 (15:18 -0700)]
Don't assume we have an array of GeoIP databases.

The attempt to open them might fail; if geoip_dat_arr is null, just
return 0 as the number of databases, don't crash.

Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c
Reviewed-on: https://code.wireshark.org/review/16025
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoPass the info strings directly to commandline_early_options().
Guy Harris [Sun, 19 Jun 2016 21:12:30 +0000 (14:12 -0700)]
Pass the info strings directly to commandline_early_options().

Just pass them directly as arguments, don't stuff them into a structure.

Change-Id: Iac84226f54898bc953011bca64795e9049762905
Reviewed-on: https://code.wireshark.org/review/16022
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoHandle capture options in pcap-less Wireshark in the commandline_ routines.
Guy Harris [Sun, 19 Jun 2016 20:21:17 +0000 (13:21 -0700)]
Handle capture options in pcap-less Wireshark in the commandline_ routines.

Get rid of the capture_option_specified and arg_error members of the
commandline_capture_param_info_t and commandline_param_info_t
structures, and have them be local variables in
commandline_early_options() and commandline_other_options().  Have
commandline_early_options() print the "sorry, Wireshark wasn't built
with pcap" and exit if -D was specified but Wireshark wasn't built with
pcap.

Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd
Reviewed-on: https://code.wireshark.org/review/16021
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoFix indentation.
Guy Harris [Sun, 19 Jun 2016 20:00:13 +0000 (13:00 -0700)]
Fix indentation.

Change-Id: I71332dc35047e7d8d32b428fb99b8b9368c41de6
Reviewed-on: https://code.wireshark.org/review/16020
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoThose aren't capture options, they're the options we must process early.
Guy Harris [Sun, 19 Jun 2016 19:55:48 +0000 (12:55 -0700)]
Those aren't capture options, they're the options we must process early.

The only one of those options that has anything to do with packet
capture is -i, and all we do there is check for an argument of "-"; the
rest are either

1) options that affect your preference settings (-C to select
   the profile, -P to set the personal file directory path);

2) options that just print something to the standard output or
   error and exit, before firing up the GUI;

3) extension command line options (-X).

Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9
Reviewed-on: https://code.wireshark.org/review/16019
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoAbility to invoke "Decode As..." as command-line argument for GUIshark.
Michael Mann [Sun, 19 Jun 2016 06:33:13 +0000 (02:33 -0400)]
Ability to invoke "Decode As..." as command-line argument for GUIshark.

TShark has had the functionality for awhile. While the GUI version
still has ways to change and persist Decode As functionality, adding
command line functionality gives the Decode As from initial launch
of the GUI.
Was also an excuse to refactor a bunch of code out of tshark.c

Bug: 5143
Change-Id: Ie67007d75e897bc06cc9afd9b84372a96b93778c
Reviewed-on: https://code.wireshark.org/review/16008
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoGet rid of an unused variable.
Guy Harris [Sun, 19 Jun 2016 16:52:55 +0000 (09:52 -0700)]
Get rid of an unused variable.

There's no need for the capture_option_specified variable; it's now in a
structure.

Change-Id: Ic2f1faee4666eea7ae91fd6899cecaa76d0ceb9f
Reviewed-on: https://code.wireshark.org/review/16018
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoGet rid of an unused variable; set a structure member.
Guy Harris [Sun, 19 Jun 2016 16:29:21 +0000 (09:29 -0700)]
Get rid of an unused variable; set a structure member.

There's no need for the capture_option_specified variable, but we *do*
need to initialize the capture_option_specified member of *param_info
before parsing the flags.

Change-Id: I89d0b8c338c2784742b21ba4e854f702ce491849
Reviewed-on: https://code.wireshark.org/review/16017
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years ago[Automatic update for 2016-06-19]
Gerald Combs [Sun, 19 Jun 2016 15:10:58 +0000 (08:10 -0700)]
[Automatic update for 2016-06-19]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Idd2d53a32188f2e607351da874b1a68a4811ed57
Reviewed-on: https://code.wireshark.org/review/16014
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoRevert "tap: change glib functions to wmem."
Pascal Quantin [Sun, 19 Jun 2016 09:01:56 +0000 (11:01 +0200)]
Revert "tap: change glib functions to wmem."

This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.

It breaks the registration of codec, dissector and libwiretap plugins.

Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoAdd modelines
Joerg Mayer [Sun, 19 Jun 2016 08:33:59 +0000 (10:33 +0200)]
Add modelines

Change-Id: I3d5ed2e671ec761f3628fb8de6f393fdc915165e
Reviewed-on: https://code.wireshark.org/review/16011
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agoCalculate and print CWmin and CWmax in addition to ECWmin and ECWmax
Joerg Mayer [Fri, 17 Jun 2016 18:28:58 +0000 (20:28 +0200)]
Calculate and print CWmin and CWmax in addition to ECWmin and ECWmax

This also changes the summary presentation to make it more compact

Change-Id: I27ef8b2da280e36cff84dcb97d6d40dc0015a74b
Reviewed-on: https://code.wireshark.org/review/16000
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agoFix problems when compiling without pcap.
Guy Harris [Sun, 19 Jun 2016 07:49:42 +0000 (00:49 -0700)]
Fix problems when compiling without pcap.

Change-Id: Id682a76ac561f92f65638bbdfcd4236eb92e46b7
Reviewed-on: https://code.wireshark.org/review/16010
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoPut #ifdef/#endif around a variable used only on Windows.
Guy Harris [Sun, 19 Jun 2016 07:38:41 +0000 (00:38 -0700)]
Put #ifdef/#endif around a variable used only on Windows.

Change-Id: Ia6fed6db03cb88433469e758693fcc72c4bd9071
Reviewed-on: https://code.wireshark.org/review/16009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRefactor command-line handling of GUI options.
Michael Mann [Sat, 18 Jun 2016 20:49:23 +0000 (16:49 -0400)]
Refactor command-line handling of GUI options.

Both GTK and Qt both use the same command-line options, so refactor
the parsing and (possibly) applying of those arguments to a single
location.

Ping-Bug: 12546
Change-Id: Ib31e576c509c5d3d21c33d3247640d9f9c68661b
Reviewed-on: https://code.wireshark.org/review/16006
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agocmake: add PIDL dissector generation support
Peter Wu [Thu, 16 Jun 2016 21:58:19 +0000 (14:58 -0700)]
cmake: add PIDL dissector generation support

The dissectors list is generated based on regex magic on pidl/Makefile.
A dssetup.cnf file is added because all other protocols already have
this file. The srvsvc and wkssvc protocols cannot be built for some
reason, so just disable it (this mirrors the original Makefile).

Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
compared to autotools.

Tested with an out-of-tree and in-tree build with cmake (make and ninja):

    cmake -GNinja && ninja -v pidl-dissectors
    touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
    cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs

Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
Reviewed-on: https://code.wireshark.org/review/15962
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoDCE/RPC: fix array of pointers with NULL
Binh Trinh [Sat, 18 Jun 2016 01:46:11 +0000 (21:46 -0400)]
DCE/RPC: fix array of pointers with NULL

Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
Reviewed-on: https://code.wireshark.org/review/16004
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoZigBee dissector added support for the Power Negotiation bit
Chris Brandson [Fri, 17 Jun 2016 18:38:15 +0000 (11:38 -0700)]
ZigBee dissector added support for the Power Negotiation bit

An update to R22 adds the Power Negotiation bit to the Parent
Information of the End Device Timeout Response

Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1
Reviewed-on: https://code.wireshark.org/review/16001
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoGTPv2: Use proto_tree_add_bitmask
Michael Mann [Fri, 17 Jun 2016 14:58:32 +0000 (10:58 -0400)]
GTPv2: Use proto_tree_add_bitmask

Change-Id: I236a3513237a7a977389438adaf381542281943d
Reviewed-on: https://code.wireshark.org/review/15997
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoMKA: tvbrange for all subtrees corrected
Samiran Saha [Fri, 17 Jun 2016 12:50:04 +0000 (18:20 +0530)]
MKA: tvbrange for all subtrees corrected

* Incorrect tvbrabge was affecting highlight on selection.

* AN & Confidentiality Offset dissection fixed.

Change-Id: Ibc4422322b765b0073471345f6e0bc3b1aeba2f9
Reviewed-on: https://code.wireshark.org/review/15996
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agossh: add RSA host key printing
Kenny Root [Thu, 16 Jun 2016 07:12:53 +0000 (00:12 -0700)]
ssh: add RSA host key printing

Adds a dissector for the ssh-rsa type of public key where the modulus
and public exponent are extracted out.

Change-Id: I10b1f2d6f41878d9f7ffe5d399b9b7d4f69ad96e
Reviewed-on: https://code.wireshark.org/review/15975
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agossh: add hostkey information
Kenny Root [Thu, 16 Jun 2016 00:05:54 +0000 (17:05 -0700)]
ssh: add hostkey information

Adds a framework for hostkey to be printed out separately from the rest
of the key exchange. This will allow for individual key information to
be presented separately in subsequent changes.

Change-Id: I27433772ef1a9e1c45f388809017ed07cf6e41fa
Reviewed-on: https://code.wireshark.org/review/15974
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>
7 years agoDiameter-3GPP: add AVP 21 RAT-Type decoding
Binh Trinh [Fri, 17 Jun 2016 03:51:14 +0000 (23:51 -0400)]
Diameter-3GPP: add AVP 21 RAT-Type decoding

Change-Id: Ibede796a52bb382525bc1f430d5fdecd555c233f
Reviewed-on: https://code.wireshark.org/review/15993
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd an expert item to asure that aifsn is at least 2
Joerg Mayer [Fri, 17 Jun 2016 15:45:28 +0000 (17:45 +0200)]
Add an expert item to asure that aifsn is at least 2

Change-Id: If7105ba2e476acca8a02ce740decc4966b0af1bb
Reviewed-on: https://code.wireshark.org/review/15998
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agotap: change glib functions to wmem.
Dario Lombardo [Tue, 3 May 2016 16:40:17 +0000 (18:40 +0200)]
tap: change glib functions to wmem.

Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoGTPV2: add decoding of ECI into enodebid and cellid
Binh Trinh [Fri, 17 Jun 2016 05:21:19 +0000 (01:21 -0400)]
GTPV2: add decoding of ECI into enodebid and cellid

Change-Id: If46cc354e202ff9a126580bf742d747e42678f83
Reviewed-on: https://code.wireshark.org/review/15994
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>
7 years agoQt: Fix a compile error occurring on RedHat Enterprise Linux.
Jens Kilian [Fri, 17 Jun 2016 10:39:09 +0000 (12:39 +0200)]
Qt: Fix a compile error occurring on RedHat Enterprise Linux.

Another missing Qt #include; probably caused by commit 157721c.

Change-Id: I8ab4be9f18dffde7159debd842201e2a67230ec8
Reviewed-on: https://code.wireshark.org/review/15995
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
7 years agoautotool: Add -Wc99-extensions CFLAGS
Alexis La Goutte [Tue, 14 Jun 2016 22:04:21 +0000 (00:04 +0200)]
autotool: Add -Wc99-extensions CFLAGS

See with CMake (ga9070e1a90)

Change-Id: If768b663f9ed032503fc121785b078c0107cdadc
Reviewed-on: https://code.wireshark.org/review/15909
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agotshark JSON and Elasticsearch output
Martin Kacer [Mon, 13 Jun 2016 13:47:44 +0000 (15:47 +0200)]
tshark JSON and Elasticsearch output

Added ouput -T for json|ek
Added -j switch fo filter EK json|ek fields.
Added -x switch to work with json|ek to insert raw fields.

Bug: 11754

Change-Id: Iad5a9092b843c074b0b774d1745fa14fca09f6b7
Reviewed-on: https://code.wireshark.org/review/15869
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoidl2wrs: fix more bad strndups
Peter Wu [Thu, 16 Jun 2016 22:23:59 +0000 (15:23 -0700)]
idl2wrs: fix more bad strndups

Fixed another g_strndup case that truncated the name and replaced more
by strdups when possible.

Change-Id: Id7ce4d82da9fb1d0071bc7a6b4e7c2062bf77f55
Reviewed-on: https://code.wireshark.org/review/15988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agomswsp: Remove null check (CID1355407)
João Valverde [Thu, 16 Jun 2016 22:26:58 +0000 (23:26 +0100)]
mswsp: Remove null check (CID1355407)

value->type is already asserted as not null (and probably shouldn't be).

Change-Id: I574d3e7e0d5c636e6b731c1c817f2e457447afc1
Reviewed-on: https://code.wireshark.org/review/15990
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAlign AUTHORS.src column
João Valverde [Wed, 15 Jun 2016 01:20:11 +0000 (02:20 +0100)]
Align AUTHORS.src column

Change-Id: I17ed5e0be356666e9b29490ce43deb357fe177ff
Reviewed-on: https://code.wireshark.org/review/15991
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoLDSS: Add an assertion (CID280539,CID280540)
João Valverde [Thu, 16 Jun 2016 09:38:33 +0000 (10:38 +0100)]
LDSS: Add an assertion (CID280539,CID280540)

Change-Id: I18082a4d45f0c320b8ee0e11139295eb1aee2c89
Reviewed-on: https://code.wireshark.org/review/15968
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoQt: Add "Copy As…" to VoIP Calls.
Gerald Combs [Thu, 16 Jun 2016 21:09:28 +0000 (14:09 -0700)]
Qt: Add "Copy As…" to VoIP Calls.

Bug: 4389
Change-Id: I88dba82bd63e8c3be2b6fac3eca88f810c62d8bd
Reviewed-on: https://code.wireshark.org/review/15985
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoCANopen: Check array bounds for untrusted index (CID 1356262)
João Valverde [Thu, 16 Jun 2016 09:18:07 +0000 (10:18 +0100)]
CANopen: Check array bounds for untrusted index (CID 1356262)

Change-Id: If5ca51e5703fa4137ab9f388a99d613752d3b0d0
Reviewed-on: https://code.wireshark.org/review/15983
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoAdd a sequence analysis wishlist item.
Gerald Combs [Thu, 16 Jun 2016 20:31:47 +0000 (13:31 -0700)]
Add a sequence analysis wishlist item.

Change-Id: Idea0bab80c7c05e3ad9f8591904e882df69a17ff
Reviewed-on: https://code.wireshark.org/review/15984
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agolemon: use a define for fseek()'s whence parameter
Martin Kaiser [Thu, 16 Jun 2016 17:20:40 +0000 (10:20 -0700)]
lemon: use a define for fseek()'s whence parameter

for people who don't immediately understand what fseek(fp, 0, 2) does

Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435
Reviewed-on: https://code.wireshark.org/review/15976
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoldap: added modify-increment operation identification in packet dissection and genera...
Victor Barratault [Thu, 16 Jun 2016 18:06:32 +0000 (14:06 -0400)]
ldap: added modify-increment operation identification in packet dissection and generate the modified dissector dissector

Change-Id: Iad745b9e0e8ab0bc055da7f26ec0822433897db7
Reviewed-on: https://code.wireshark.org/review/15977
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoDEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 16 Jun 2016 18:51:24 +0000 (20:51 +0200)]
DEC DNART: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ic2d333b418928351f32673890c9c432c7bfa0f16
Reviewed-on: https://code.wireshark.org/review/15982
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoSITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 16 Jun 2016 18:48:58 +0000 (20:48 +0200)]
SITA: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I2565b0bee66f934561df506e87a35fdd14590f92
Reviewed-on: https://code.wireshark.org/review/15981
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoDCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value
Michael Mann [Wed, 15 Jun 2016 22:54:07 +0000 (18:54 -0400)]
DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_value

Change-Id: I88398aa1923e86bb83b97cc3904529a5810f6c40
Reviewed-on: https://code.wireshark.org/review/15978
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd Cisco ttag dissector
Jaap Keuter [Tue, 14 Jun 2016 21:59:12 +0000 (23:59 +0200)]
Add Cisco ttag dissector

Add dissector for Cisco ttag protocol.

Bug: 12518
Change-Id: Id17293a80b2b6827fd2d5c7ead098784c35a28ef
Reviewed-on: https://code.wireshark.org/review/15964
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>