jlayton/wireshark.git
7 years agoceph: start decoding inodes ceph
Jeff Layton [Fri, 24 Jun 2016 18:21:08 +0000 (14:21 -0400)]
ceph: start decoding inodes

Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoceph: add missing feature flags
Jeff Layton [Fri, 24 Jun 2016 02:02:02 +0000 (22:02 -0400)]
ceph: add missing feature flags

Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoceph: add C_FEATURE_FS_BTIME flag
Jeff Layton [Thu, 23 Jun 2016 22:33:55 +0000 (18:33 -0400)]
ceph: add C_FEATURE_FS_BTIME flag

Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoceph: don't initialze c_node port values to 0xFFFF
Jeff Layton [Tue, 21 Jun 2016 20:31:14 +0000 (16:31 -0400)]
ceph: don't initialze c_node port values to 0xFFFF

0xFFFF is a legitimate port number. Initialze it to 0 instead, since
that one is not.

Change-Id: I2d1918f6bc0664c2605d58b7ebdead7c50f282de
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoceph: distingush between client and server by checking for a second entity_addr_t
Jeff Layton [Tue, 21 Jun 2016 20:28:39 +0000 (16:28 -0400)]
ceph: distingush between client and server by checking for a second entity_addr_t

The current ceph dissector assumes that the server will always send its
initial connection negotiation first, but that's not necessarily the
case, especially with the kernel client which sends its banner as soon
as the socket is created.

So, we need a better mechanism to determine which end is client and
which is the server. The server sends its own address and then the
address of the client, but the client only sends its own address. We
can determine whether the initial negotiation message is from the client
or server by looking at the data after the first entity addr and seeing
whether it also looks like an entity addr.

This patch takes that approach. It just grabs the address family from
the second address and sees whether it's IPv4 or IPv6. If it's not one
of those, then it assumes that it's not an entity_addr_t at all and is
therefore a request from the client.

We could go farther and try to verify the port and address as well, but
that's probably overkill. The address family is at the same offset as
the host_type field in the client's Connect request, but it's big endian
and the host_type is little endian. As long as we don't end up with
host_types that are 0x200 or 0xA00, this scheme should be OK.

Change-Id: I161d02da86d978272eff95497c6df66766b02ebc
Signed-off-by: Jeff Layton <jlayton@redhat.com>
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>
7 years agoFinish getting making the Diameter XML valid XML.
Jeff Morriss [Thu, 16 Jun 2016 16:43:24 +0000 (12:43 -0400)]
Finish getting making the Diameter XML valid XML.

... Except for the fact that many AVP names start with "3GPP".

Make the AVP names XML IDs again.

Fix all the grouped AVPs that reference AVPs (by name) or vice-versa.  This
includes:
 * Fixing a bunch of typos (including type mismatches).
 * Commenting out a number of references to vendor AVPs for which we don't have
   the specs.
 * Adding a few missing AVPs.

Change-Id: Ic2ddb50cc947877de9086be51f7813e8f9be02b4
Reviewed-on: https://code.wireshark.org/review/15973
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agossh: set packet lengths correctly
Kenny Root [Thu, 16 Jun 2016 06:53:49 +0000 (23:53 -0700)]
ssh: set packet lengths correctly

Each SSH packet was being set to be the remaining length of the frame.
This change sets the packet lengths correctly for each SSH packet.

Change-Id: Id9c2331d875465cd5e6bb788d420e0025f5d496e
Reviewed-on: https://code.wireshark.org/review/15966
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agossh: packets after SSH_MSG_NEWKEYS are encrypted
Kenny Root [Thu, 16 Jun 2016 06:54:43 +0000 (23:54 -0700)]
ssh: packets after SSH_MSG_NEWKEYS are encrypted

According to RFC 4253 section 7.3, once the SSH_MSG_NEWKEYS is received
all packets after that will be encrypted using the negotiated keys. This
can happen in the middle of a frame, so account for the offset in the
frame where this happens.

Change-Id: Ibc3b06a4bdfe38ae15b0e65afac6f5d3646cb58d
Reviewed-on: https://code.wireshark.org/review/15965
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoDCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags
Michael Mann [Wed, 15 Jun 2016 19:35:51 +0000 (15:35 -0400)]
DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags

Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
Reviewed-on: https://code.wireshark.org/review/15942
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 agoMKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite
Samiran Saha [Thu, 16 Jun 2016 11:45:06 +0000 (17:15 +0530)]
MKA: Fix for GCM-AES-256 dissection & Added Enumeration for macsec-cipher-suite

Change-Id: Ief38f949d3e30754a65fbfeaa64cbbd2f5646a9b
Reviewed-on: https://code.wireshark.org/review/15969
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 agoNSH: Correct the display of the NSH header fields
Thomas Shen [Wed, 15 Jun 2016 21:26:02 +0000 (14:26 -0700)]
NSH: Correct the display of the NSH header fields

Change-Id: I3be75d20a3f00091aa3077e475f9ddb00eeca06c
Reviewed-on: https://code.wireshark.org/review/15963
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 agogtk: Check chunk before g_string_chunk_clear
Stig Bjørlykke [Thu, 16 Jun 2016 12:32:58 +0000 (14:32 +0200)]
gtk: Check chunk before g_string_chunk_clear

Avoid this warning from wireshark-gtk:
 (wireshark-gtk:39505): GLib-CRITICAL **: g_string_chunk_clear: assertion
 'chunk != NULL' failed

Change-Id: I413b3435a1ac595236dd1c4e619e3af1543b6a91
Reviewed-on: https://code.wireshark.org/review/15970
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 agoTyping error line 4928 of packet-dns.c
Victor Barratault [Tue, 14 Jun 2016 16:17:54 +0000 (12:17 -0400)]
Typing error line 4928 of packet-dns.c

Change-Id: I1a6409262614a87c159236375223707c85114650
Reviewed-on: https://code.wireshark.org/review/15972
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agogitignore: updated cmake paths
Peter Wu [Thu, 16 Jun 2016 05:23:46 +0000 (22:23 -0700)]
gitignore: updated cmake paths

* files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
* epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
  libwireshark build")
* asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")

Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
Reviewed-on: https://code.wireshark.org/review/15961
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agofilesystem: Fix build dir detection when using cmake
Peter Wu [Sat, 28 Feb 2015 16:44:27 +0000 (17:44 +0100)]
filesystem: Fix build dir detection when using cmake

Fixes loading of plugins by detecting the build output directory of
cmake. This requires a "CMakeCache.txt" file to be present in the parent
directory (above run/).

Change-Id: I297432cdcd0981646058410f3eadf5f73b5248c8
Reviewed-on: https://code.wireshark.org/review/7453
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 agoAdd a note about the new intelligent scroll bar.
Gerald Combs [Wed, 15 Jun 2016 20:17:41 +0000 (13:17 -0700)]
Add a note about the new intelligent scroll bar.

Should we call it the intelligenter scroll bar?

Change-Id: I67e76c1aabeb4b2e87e38815fe4ab120f0869b25
Reviewed-on: https://code.wireshark.org/review/15936
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoCID 1250642: check the return value of dup()
Martin Kaiser [Thu, 16 Jun 2016 02:53:45 +0000 (19:53 -0700)]
CID 1250642: check the return value of dup()

abort if it is -1

Change-Id: Ie14c18679ff74529731558d6742f63ebfb9fe97b
Reviewed-on: https://code.wireshark.org/review/15958
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 agoMake the rest of the Diameter AVP names unique.
Jeff Morriss [Thu, 16 Jun 2016 04:04:36 +0000 (00:04 -0400)]
Make the rest of the Diameter AVP names unique.

In most cases this means prepending the application- or vendor-name to force
uniqueness.  A few vendors have duplicates within their namespace--append the
AVP code to these.

Also fix a few other invalid names (with spaces or parentheses in the names).

Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
Reviewed-on: https://code.wireshark.org/review/15960
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agocmake: Detect proper large file defines even with -Wno-error
Balint Reczey [Wed, 15 Jun 2016 05:29:34 +0000 (22:29 -0700)]
cmake: Detect proper large file defines even with -Wno-error

Without this change large file support was detected as available
even when it was not without additional flags on 32 architectures.

As a result mergecap and other programs are built without large
file support causing mergecap not being able to write files
bigger than 2GB on i386 systems. This used to work properly
with autotools builds, but not with CMake ones.

Change-Id: Ibfd043342b2a48310d2ac9d760e6404a701c5808
Reviewed-on: https://code.wireshark.org/review/15937
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
7 years agoqt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsD...
Dario Lombardo [Tue, 14 Jun 2016 22:47:44 +0000 (00:47 +0200)]
qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog.

Add a reference count to stat_tap_table_ui to prevent bad deallocations.

Bug: 12437
Change-Id: Ib9b1f929d08a574c306dc755ec416ab94a3fd6d3
Reviewed-on: https://code.wireshark.org/review/15920
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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 agoUpdate the X11 dissector to use the latest mesa and xcbproto.
Jeff Morriss [Wed, 15 Jun 2016 17:25:44 +0000 (13:25 -0400)]
Update the X11 dissector to use the latest mesa and xcbproto.

Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
Reviewed-on: https://code.wireshark.org/review/15923
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 agoQt: Clarify follow stream dialog's format button
Balint Reczey [Thu, 16 Jun 2016 02:16:42 +0000 (19:16 -0700)]
Qt: Clarify follow stream dialog's format button

The stream is not just shown, but also saved in ASCII, EBDIC, Raw, etc.

Change-Id: Ic29e3273ebb9a3eca0fe791bdd48606c4be3b828
Reviewed-on: https://code.wireshark.org/review/15957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoX11: Fix last indent issue on X11 generator
Alexis La Goutte [Wed, 15 Jun 2016 21:35:58 +0000 (23:35 +0200)]
X11: Fix last indent issue on X11 generator

and regenerate X11 dissector

Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af
Reviewed-on: https://code.wireshark.org/review/15944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agox11: Regenerate dissector after indent change on g2b8caf31cca
Alexis La Goutte [Wed, 15 Jun 2016 20:52:18 +0000 (22:52 +0200)]
x11: Regenerate dissector after indent change on g2b8caf31cca

Change-Id: Iac1522998c5983b417a0083b9c607a60e7f66e8c
Reviewed-on: https://code.wireshark.org/review/15943
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agorandpktdump: fix a crash.
Dario Lombardo [Wed, 15 Jun 2016 23:25:03 +0000 (01:25 +0200)]
randpktdump: fix a crash.

Randpktdump requires the init the wtap opttypes.
Fixed making the init function public and calling it.

Bug: 12539
Change-Id: I02585c41012deacff1526b51ed09ab555cbfc8ce
Reviewed-on: https://code.wireshark.org/review/15951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: 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 agoDon't call g_ascii_strcasecmp() with an NULL string.
AndersBroman [Wed, 15 Jun 2016 21:57:39 +0000 (23:57 +0200)]
Don't call g_ascii_strcasecmp() with an NULL string.

Change-Id: I6efbdcb51efe5f2db233827e32e2105db6322d6c
Reviewed-on: https://code.wireshark.org/review/15946
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agogtk: add initializer (CID 1362745).
Dario Lombardo [Thu, 16 Jun 2016 00:34:27 +0000 (02:34 +0200)]
gtk: add initializer (CID 1362745).

Change-Id: Ib1bc11e905b0a4e84302e3f9ac43f3a87afd6edf
Reviewed-on: https://code.wireshark.org/review/15954
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agoRemove a bunch of unassigned ETSI AVPs.
Jeff Morriss [Thu, 16 Jun 2016 02:01:31 +0000 (22:01 -0400)]
Remove a bunch of unassigned ETSI AVPs.

These were presumably there to allow indexed search of the AVP list but it
wasn't working anyway (binary search was used).  And the expert info for
"unknown" (to Wireshark) AVPs is a good thing.

Change-Id: Id6b9e5c90b8a2a6e3cf4415cd1b6114308c74440
Reviewed-on: https://code.wireshark.org/review/15956
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoip-over-ib description entry was missing
Rudra Rugge [Wed, 15 Jun 2016 22:22:25 +0000 (15:22 -0700)]
ip-over-ib description entry was missing

Description entry was missing in the list.

Change-Id: Ia8f8bd4608ee6800a352f4979752b5c45c4a5086
Reviewed-on: https://code.wireshark.org/review/15947
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 agoExport wtap_optionblock_copy_options() symbol
Pascal Quantin [Thu, 16 Jun 2016 01:06:04 +0000 (18:06 -0700)]
Export wtap_optionblock_copy_options() symbol

It can be useful for wiretap plugins

Change-Id: Ic56e4357ba3bfcef30d13615efc1361399c3133e
Reviewed-on: https://code.wireshark.org/review/15955
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agofile_util.c: do not search in Npcap installation folder when calling ws_load_library()
Pascal Quantin [Wed, 15 Jun 2016 20:42:56 +0000 (13:42 -0700)]
file_util.c: do not search in Npcap installation folder when calling ws_load_library()

ws_load_library() is not used to load packet.dll or wpcap.dll (we use ws_module_open() for this).
Let's not lose time checking the folder content.

Change-Id: Ibd4a71b8b0c5ffc0c4c146eca51ad9f20964515b
Reviewed-on: https://code.wireshark.org/review/15938
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agomongo: return the number of bytes we actually consumed
Martin Kaiser [Wed, 15 Jun 2016 20:02:39 +0000 (13:02 -0700)]
mongo: return the number of bytes we actually consumed

even if the document length is 0, we consumed at least 4 bytes for the
length field

bug: 12534
Change-Id: I2f1612bf575b558c1bcc0afe8202b202747846e3
Reviewed-on: https://code.wireshark.org/review/15934
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoMake some more Diameter AVP names unique.
Jeff Morriss [Wed, 15 Jun 2016 22:40:53 +0000 (18:40 -0400)]
Make some more Diameter AVP names unique.

In some cases this means using the correct (updated?) name from the
specification. In others it means prepending the application- or vendor-name
to force uniqueness.

Remove a few more "Unassigned" AVPs from the XML files.

Change-Id: I61d55ef97ff8efc3317c91bf79e73031735f740a
Reviewed-on: https://code.wireshark.org/review/15949
Reviewed-by: Anders Broman <a.broman58@gmail.com>