metze/wireshark/wip.git
7 years agoThrow in another tweak to check for uninitialized cops_call_t structures.
Guy Harris [Tue, 6 Dec 2016 21:37:45 +0000 (13:37 -0800)]
Throw in another tweak to check for uninitialized cops_call_t structures.

Temporariy add a "magic" field, initialize it when we allocate it, and
whenever we fetch a structure from the array, make sure the "magic"
field has the right value.

(If this all turns out to be a valgrind bug, I'm not going to be very
happy.)

Change-Id: I29becc715367fdc305504b38d48be05dc516132a
Reviewed-on: https://code.wireshark.org/review/19128
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agopacket-rpcrdma: Prepare dissector for RPC-over-RDMA on iWARP or RoCE
Chuck Lever [Fri, 11 Nov 2016 22:35:58 +0000 (17:35 -0500)]
packet-rpcrdma: Prepare dissector for RPC-over-RDMA on iWARP or RoCE

Remove the Infiniband-centric QP filtering. This filtering attempted
to create conversations to allow the heuristic dissector to be
bypassed once it was established that a QP was carrying
RPC-over-RDMA traffic.

However, it was preventing proper identification of RPC-over-RDMA
traffic when a CM connection establishment exchange doesn't appear
in the capture (which is frequently the case for captures of NFS
traffic).

Also, without this conversation logic, loading a capture file
appears to be significantly faster, at least for capture files
I have on hand.

Later, some form of conversation management will be needed in
order to associate RPC-over-RDMA transport headers with
RDMA Read and Write operations that go along with them. But it
will need to be agnostic about the underlying link layer.

Bug: 13199
Bug: 13202
Change-Id: Ie6b7a4c65979dac036306f7367ce18836713ab4d
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19032
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 agopacket-tns: add TNS_TYPE_DATA functions dissection.
Alexandr Savca [Sat, 3 Dec 2016 13:36:51 +0000 (15:36 +0200)]
packet-tns: add TNS_TYPE_DATA functions dissection.

Those functions also known as NET8 commands or SQLNET layer of TNS protocol.
Also added a lot of sub-functions for one NET8 command, also known as OCI
(Oracle Call Interface).

Do other cleanup while in the neighbor hood including:
1. Use proto_tree_add_bitmask where applicable
2. Remove individual "hidden" command fields. Filtering should use "tns.type"
3. Remove unnecessary if (tree)s

Change-Id: Ib7cc5cf307179d5d252c334949a4e77d9d396ba4
Reviewed-on: https://code.wireshark.org/review/19050
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: Michael Mann <mmann78@netscape.net>
7 years agoreformatted IMF export objects
bwhitn [Tue, 6 Dec 2016 18:58:17 +0000 (10:58 -0800)]
reformatted IMF export objects

Change-Id: I3d8da3f481d6808d374c2a906652370a46a4c088
Reviewed-on: https://code.wireshark.org/review/19121
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Moshe Kaplan <me@moshekaplan.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoChange SpanDSP capitalization
Pascal Quantin [Tue, 6 Dec 2016 19:49:12 +0000 (20:49 +0100)]
Change SpanDSP capitalization

Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP),
let's use the one found in the library README and in its spec file.

Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c
Reviewed-on: https://code.wireshark.org/review/19122
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agocops: try to avoid uninitialized warning error
Peter Wu [Tue, 6 Dec 2016 16:46:09 +0000 (17:46 +0100)]
cops: try to avoid uninitialized warning error

Valgrind 3.11.0 on the Ubuntu 16.04 buildbot reports that
cops_call->solicited is not initialized:

    pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value));
    /* ... */
    for (i=0; i < pdus_array->len; i++) {
        cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i);
        if ( /* ... */
        ( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) &&
                                                  ^^^^^^^^^^^^^^^^^^^^

which is clearly bogus since the only place where cops_call could be
created is a few lines up:

    ver_flags = tvb_get_guint8(tvb, offset);
    is_solicited = (lo_nibble(ver_flags) == 0x01);
    /* ... */
    pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value));
    if (pdus_array == NULL) {
        pdus_array = g_ptr_array_new();
        wmem_map_insert(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value), pdus_array);
    }
    /* ... */
    cops_call = wmem_new(wmem_file_scope(), cops_call_t);
    cops_call->op_code = op_code;
    cops_call->solicited = is_solicited;
    /* ... */
    g_ptr_array_add(pdus_array, cops_call);

Try to zero the whole structure to avoid this bogus warning.

Change-Id: I1ec4d23e99c987849af580a1c8134610c383e55e
Ping-Bug: 13044
Ping-Bug: 13203
Reviewed-on: https://code.wireshark.org/review/19119
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoBluetooth: SMP: Indicate when keys are Debug
Michal Labedzki [Wed, 9 Nov 2016 15:34:34 +0000 (16:34 +0100)]
Bluetooth: SMP: Indicate when keys are Debug

Debug mode keys are described by Bluetooth Core4 specification.
Inform user if any of keys are debug. Debug mode is only if both
keys are debug.

Change-Id: Id7f58c2445614dc386a67b91cbe6f78ffbeda880
Reviewed-on: https://code.wireshark.org/review/19083
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoQt: Make the RTP player output device selectable.
Gerald Combs [Fri, 2 Dec 2016 23:52:02 +0000 (15:52 -0800)]
Qt: Make the RTP player output device selectable.

Add a combobox for selecting the output device and populate it with our
available devices. Let the user know if our output format isn't
supported.

Ping-Bug: 13105
Change-Id: I299c7d0f191bb66d93896338036000e2c377781f
Reviewed-on: https://code.wireshark.org/review/19046
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoBluetooth: SMP: Dissect remaining Key Distribution bits
Michal Labedzki [Thu, 27 Oct 2016 11:51:05 +0000 (13:51 +0200)]
Bluetooth: SMP: Dissect remaining Key Distribution bits

Add "Linkkey" and "Reserved" fields.

Change-Id: I21a23824348500bbcf8366c947fe2d6599b015d4
Reviewed-on: https://code.wireshark.org/review/19081
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: Michael Mann <mmann78@netscape.net>
7 years agopacket-rpcrdma: Add filter variable for Write chunk segment count
Chuck Lever [Mon, 5 Dec 2016 02:47:57 +0000 (21:47 -0500)]
packet-rpcrdma: Add filter variable for Write chunk segment count

Allow the Write segment count field to be selected and filtered on.
In many Write chunks there is just one segment. However in some
special cases there can be multiple segments in a Write or Reply
chunk.

Change-Id: Ic4a4104e3a44bf4f2c96e4e5353a10e7547350c9
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19102
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 udpdump to the macOS package.
Gerald Combs [Tue, 6 Dec 2016 16:53:10 +0000 (08:53 -0800)]
Add udpdump to the macOS package.

Change-Id: I9d16a8291efdd564a905b2f8bc1ded4fa1aa718d
Reviewed-on: https://code.wireshark.org/review/19118
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agocodecs: Add support for G.722 and G.726
Peter Wu [Wed, 23 Nov 2016 23:27:14 +0000 (00:27 +0100)]
codecs: Add support for G.722 and G.726

Integrate the Spandsp library for G.722 and G.726 support. Adds support
for G.722 and all eight variants of G.726.

Note: this also fixes a crash in Qt (buffer overrun, reading too much
data) caused by confusion of the larger output buffer (resample_buff)
with the smaller input buffer (decode_buff). It was not triggered before
because the sample rate was always 8k, but with the addition of the new
codecs, a different sample rate became possible (16k).

Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled
and the VOIP Calls dialog is opened (the begin frame, start_fd, is not
yet known and therfore a NULL dereference could occur).

Passes testing (plays normally without bad RTP timing errors) with
SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested
with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled.

Bug: 5619
Change-Id: I5661908d193927bba50901079119eeff0c04991f
Reviewed-on: https://code.wireshark.org/review/18939
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoAutotools: Disable Qt4 on macOS.
Gerald Combs [Fri, 2 Dec 2016 19:36:45 +0000 (11:36 -0800)]
Autotools: Disable Qt4 on macOS.

Add a check for macOS+Qt4 to configure.ac in order to roughly match the
CMake behavior in ge858829.

Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e
Reviewed-on: https://code.wireshark.org/review/19036
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: Peter Wu <peter@lekensteyn.nl>
7 years agoSDP: Fix compiler warning
Michael Mann [Thu, 22 Sep 2016 17:36:44 +0000 (13:36 -0400)]
SDP: Fix compiler warning

Change-Id: I5d415ba9ce7ae62eff43d47ceaa96e6282eaad1a
Reviewed-on: https://code.wireshark.org/review/19113
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: Peter Wu <peter@lekensteyn.nl>
7 years agoDOF: fix UAT update callbacks
Pascal Quantin [Tue, 6 Dec 2016 13:50:09 +0000 (14:50 +0100)]
DOF: fix UAT update callbacks

- update callback must return a boolean to indicate success / failure
- error message must be allcoated in glib memory as GUI will g_free it

Bug: 13209
Change-Id: Ibb9690034d66dae85e775d0010aadeb192c76b4a
Reviewed-on: https://code.wireshark.org/review/19111
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: 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 agoBluetooth: Sync "Classic" color rules
Michal Labedzki [Fri, 28 Oct 2016 06:26:12 +0000 (08:26 +0200)]
Bluetooth: Sync "Classic" color rules

Change-Id: Ic64f9b71eba4ba8c79c28e10fe4eac983ca98f22
Reviewed-on: https://code.wireshark.org/review/19085
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
7 years agosdp: refactor session/media level handling of attributes
Peter Wu [Sun, 4 Dec 2016 23:43:02 +0000 (00:43 +0100)]
sdp: refactor session/media level handling of attributes

The media_count meaning is horrendous. -1 means "none", a count of "0"
actually means "1". This led to various bugs in the past, so just rip it
out and use a (wmem) array from which the length can be determined.

That also means that a hard-coded limit on the media can now easily be
lifted without affecting the size of the transport_info_t structure.
(This limit, SDP_MAX_RTP_CHANNELS,  is unchanged in this patch though.)

Refactor the SDP dissector such that:

 - Media and related attributes are no longer a bunch of fixed array
   fields, but grouped in one structure. This results in the largest
   changes all over the place since "transport_info->media[n]" is now
   transformed into "media_desc->media" where "media_desc" is an element
   of the "transport_info->media_descriptions" wmem array.
 - Simplify protocol (in "m=") parsing (lots of ifs -> array + loop).
 - Remove convert_disposable_media and disposable_media_info_t, parse
   fields (media protocol from "m=", connection address from "c=", etc.)
   while parsing the SDP instead of parsing it at the end.
 - Have two distinct structures for keeping the info for the session and
   media level. Emphasize that new media descriptions are inherited from
   session level attributes (via sdp_new_media_description).
 - Delay creation of dynamic payload type information table until we
   actually create the media description. Create function
   clean_unused_media_descriptions to handle the common of freeing
   unused dynamic pt.
 - Remove SDP_IPv4/SDP_IPv6, these are replaced by checking the type
   member of the address structure.

Changes to MSRP part:

 - Move MSRP attributes to the media-level attributes.
 - Remove msrp_transport_address_set attribute, rely on the AT_NONE
   address type for detecting bad addresses.
 - Remove SDP_MSRP_IPv4 check, this never worked as the flag was never
   set. Now it relies on the address family from the host in a=path:.

Tested with these capture files with no change in PDML output nor
improvements/regressions with memleaks (as reported by ASAN):

    capture sip call wireshark 1.8.2.pcap
    NOringback.pcapng
    rtp_not_parsed_by_1_10_1.pcap
    rtsp_interleaved_coreplayer.cap
    SIP_CALL_RTP_G711.pcapng
    srtpincorrectlyselected.pcap
    tdnwifitontwifi_withnatting_clientAbhopati_03082015.pcapng

Change-Id: Ia0dbc63f8bd78cc84dad2e18174540e31b78a80d
Reviewed-on: https://code.wireshark.org/review/19072
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 agortp: add function to duplicate rtp_dyn_payload_t
Peter Wu [Mon, 5 Dec 2016 22:00:33 +0000 (23:00 +0100)]
rtp: add function to duplicate rtp_dyn_payload_t

There is no way to iterate through the contents. For a future patch to
the SDP dissector (where the session-level info is copied to the
media-level), it would be nice to duplicate the dynamic payload info.

Change-Id: I79b8349e5e157298a28fc608e20c2c2e03e76400
Reviewed-on: https://code.wireshark.org/review/19106
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 agoDTLS: add support for use_srtp extension (RFC 5764)
Peter Wu [Wed, 30 Nov 2016 20:43:09 +0000 (21:43 +0100)]
DTLS: add support for use_srtp extension (RFC 5764)

Decryption support will be added later. Tested with
dtls-srtp-ws-sip.pcapng from the linked bug.

Change-Id: Ida1a2da754ef9aef16ad15ff64455b6f8e703ffd
Ping-Bug: 13193
Reviewed-on: https://code.wireshark.org/review/18996
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agossh: add dissection for ECDSA host keys
Роман Донченко [Mon, 5 Dec 2016 19:43:21 +0000 (22:43 +0300)]
ssh: add dissection for ECDSA host keys

Change-Id: Ic9851976bfa25fc61c708ee08e5a26ad01769f06
Reviewed-on: https://code.wireshark.org/review/19097
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoSDP: reduce code duplication
Peter Wu [Sat, 3 Dec 2016 00:20:10 +0000 (01:20 +0100)]
SDP: reduce code duplication

Observe that some code in setup_sdp_transport is effectively the same
code as a part from dissect_sdp with these differences:

 - Removal of these two conditions (setup_sdp_transport already returns
   early when a packet is visited):
    (!pinfo->fd->flags.visited) && (transport_info == &local_transport_info)
 - "establish_frame" in setup_sdp_transport is replaced by "pinfo->num"
   in dissect_sdp.

dissect_sdp further has two additional blocks that add information to
the VoIP calls dialog. This is preserved.

Freeing of the RTP payload information has also been simplified. Instead
of checking it inside the main loop that adds addresses (now moved to a
new function, "apply_sdp_transport"), let the caller do it outside the
loop.

The transformation in this patch is rather mechanical:

 0. Add a comment on what the new function is supposed to do.
 1. Move code from setup_sdp_transport into a new function,
    apply_sdp_transport and reduce indentation level.
 2. Copy all variables to the new function and populate the parameter
    list.
 3. Compile result, remove unused variables that the compiler warns for.
 4. Move freeing of unused media outside the loop to the caller.
 5. Create a new conditional statement before the duplicated loop, which
    checks whether setup_sdp_transport has been used before. (SIP first
    calls setup_sdp_transport, then it invokes the media type dissector
    which calls dissect_sdp to populate the tree.)
 6. Remove the duplicated code from the dissect_sdp loop until only the
    VoIP Calls dialog info remains.

There is no functional change intended.

Change-Id: I928379466af56ef1729cccbf4a5b60895ddb3227
Reviewed-on: https://code.wireshark.org/review/19047
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: Michael Mann <mmann78@netscape.net>
7 years agoSDP: add basic ICE candidate attribute dissection (RFC 5245)
Peter Wu [Wed, 30 Nov 2016 20:57:56 +0000 (21:57 +0100)]
SDP: add basic ICE candidate attribute dissection (RFC 5245)

Dissect the first, fixed part of a=candidate. The candidate type is also
unabbreviated for easier understanding. Tested with
dtls-srtp-ws-sip.pcapng from the linked bug.

Change-Id: I9950c8f066becea86f1fe8e9ffab2dc07ae0f425
Ping-Bug: 13193
Reviewed-on: https://code.wireshark.org/review/18997
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoCIP: Minor enhancements
D. Ulis [Mon, 5 Dec 2016 12:43:03 +0000 (07:43 -0500)]
CIP: Minor enhancements

1. ENIP: Display the CIP Forward Open Request packet number for connected data
2. CIP: Extended Network: Display expert info when the expected bytes does not match actual bytes
3. CIP: Look up more data fields as CIP service or Device Type
4. CIP: Display data as Dec/Hex, depending on how the spec shows things
5. Minor: Pull out common code into load_cip_request_data()
6. Minor: Text corrections

Change-Id: I184ac3899786f650e4d4643a5dfe68bba785d6e0
Reviewed-on: https://code.wireshark.org/review/19092
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-rpcrdma: Clean up Reply chunk dissection
Chuck Lever [Mon, 5 Dec 2016 01:16:59 +0000 (20:16 -0500)]
packet-rpcrdma: Clean up Reply chunk dissection

Display the Reply chunk as a tree, using the same code that the
Write list dissector now uses. Fix up the selection size of the
Reply chunk.

Bug: 13197
Change-Id: Ie861b7721b2c2dd9a5839986488ee22f39f81d1e
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19101
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 agopacket-rpcrdma: Fix Write list dissection
Chuck Lever [Sun, 4 Dec 2016 23:39:39 +0000 (18:39 -0500)]
packet-rpcrdma: Fix Write list dissection

The current mechanism of dissecting RPC-over-RDMA chunk lists is not
working. It treats the Write list as a list of RDMA segments (it's a
list of counted arrays).

Bug: 13197
Change-Id: I6f8e788d66eefd17d6c1995e238a9ff9fa1e81f2
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19100
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-rpcrdma: Fix Read list dissection
Chuck Lever [Sun, 4 Dec 2016 22:36:59 +0000 (17:36 -0500)]
packet-rpcrdma: Fix Read list dissection

The current mechanism of dissecting RPC-over-RDMA chunk lists is not
working. It treats the Read list as a counted array (it's a list).

Part of this confusion arises because RFC 5666 uses the term "chunk"
to mean "chunk", "read segment", and "rdma segment". Re-organize
the dissector logic to make this distinction properly.

Bug: 13197
Change-Id: Iad517804dbcf8b30de795af03af7a71a6f231231
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19099
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoRTPS: Cleanup endian handling
Michael Mann [Mon, 5 Dec 2016 20:21:34 +0000 (15:21 -0500)]
RTPS: Cleanup endian handling

1. Rather than pass a boolean that has to be continually evaluated, just pass the
necessary encoding (ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN)
2. Incorporate more use of proto_tree_add_item_ret_[u]int
3. Remove NEXT_guint16 and NEXT_guint32 because we now have tvb_get_guint16 and
tvb_get_guint32

Change-Id: Ib1c3488450b4e727d2c1943ba4e577faf2350dcc
Reviewed-on: https://code.wireshark.org/review/19103
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 agokafka: add dissection for rest of api keys
Dmitry Lazurkin [Fri, 25 Nov 2016 19:45:02 +0000 (22:45 +0300)]
kafka: add dissection for rest of api keys

- support rest of api keys
- dissect kafka.required_acks with constants
- dissect kafka.message_timestamp_type
- add expert info about missing request

Change-Id: I3d18936adac6702a61f545385bdec1b75b564bd9
Reviewed-on: https://code.wireshark.org/review/18954
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
7 years agopacket-rpcrdma: Display length fields in decimal
Chuck Lever [Mon, 5 Dec 2016 03:11:12 +0000 (22:11 -0500)]
packet-rpcrdma: Display length fields in decimal

Change-Id: I3a3a51de76286800992b1445c332c50059112c54
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19098
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-rpcrdma: Remove if (tree) preventing dissectors being called.
Chuck Lever [Sun, 4 Dec 2016 21:58:37 +0000 (16:58 -0500)]
packet-rpcrdma: Remove if (tree) preventing dissectors being called.

When tshark displays each frame in default mode (without -V):

- NFS on TCP is dissected and displayed
- NFS on RPC/RDMA is displayed as only an RPC/RDMA frame

NFS on RPC/RDMA should be dissected and displayed just like NFS on
TCP. Make passing along the RPC payload to the RPC dissector
unconditional.

Bug: 13198
Change-Id: Ia86f3abcfcbc65a860d4ff7bac19a5f3af44a0b0
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19027
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoCMake: Update FindWiX.
Gerald Combs [Mon, 5 Dec 2016 18:53:32 +0000 (10:53 -0800)]
CMake: Update FindWiX.

The WiX Toolset installer sets the WIX environment variable. Search for
our WiX executables there first.

Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3
Reviewed-on: https://code.wireshark.org/review/19096
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoRTPS: Added submessages and fixed minor issues for Secure DDS
Juanjo Martin [Wed, 30 Nov 2016 16:13:30 +0000 (17:13 +0100)]
RTPS: Added submessages and fixed minor issues for Secure DDS

Bug: 13204
Change-Id: Iaad562aafe3a4f0300398fc45927ac810814ee75
Reviewed-on: https://code.wireshark.org/review/18990
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: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: SMP: Dissect remaining AuthReq bits
Michal Labedzki [Wed, 26 Oct 2016 12:56:30 +0000 (14:56 +0200)]
Bluetooth: SMP: Dissect remaining AuthReq bits

Dissect SC, Keypress and Reserved bits.
Up to Bluetooth Core 4 specification.

Change-Id: Id7ac75bd917786abe9aada433a1343887a32234d
Reviewed-on: https://code.wireshark.org/review/19079
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: SMP: Implement 3 more commands
Michal Labedzki [Wed, 26 Oct 2016 13:53:12 +0000 (15:53 +0200)]
Bluetooth: SMP: Implement 3 more commands

0x0C: /* Pairing Public Key */
0x0D: /* Pairing DHKey Check" */
0x0E: /* Pairing Keypress Notification */

Change-Id: I18dc88d2cb7a96412b230a9b414ce053bfde09fa
Reviewed-on: https://code.wireshark.org/review/19080
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: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: SMP: Add coloring rule for SMP
Michal Labedzki [Thu, 27 Oct 2016 13:22:27 +0000 (15:22 +0200)]
Bluetooth: SMP: Add coloring rule for SMP

SMP occurs very rare, because of it nature - it is just pairing
procedure. It is better to distinguish it from L2CAP by assigned to it
another yellow colour.

Change-Id: I71e8641b717581253cd86cc867fa71241e7650b7
Reviewed-on: https://code.wireshark.org/review/19082
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: BTLE*: Initialize what initialized was not
Michal Labedzki [Wed, 9 Nov 2016 11:51:15 +0000 (12:51 +0100)]
Bluetooth: BTLE*: Initialize what initialized was not

Fix unexpected Direction flag pass to BTLE dissector
what caused reassemble of L2CAP not working correctly
(it based on Source/Destination addresses/columns).

Change-Id: I10fb17c29b020f6ca746f7bbccb7527e0ba04624
Reviewed-on: https://code.wireshark.org/review/19084
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: Assigned Numbers: Update Member UUIDs
Michal Labedzki [Fri, 28 Oct 2016 13:47:01 +0000 (15:47 +0200)]
Bluetooth: Assigned Numbers: Update Member UUIDs

Update manually from time to time based on:
https://www.bluetooth.com/specifications/assigned-numbers

Change-Id: I506e58c16322862c9fe517b71ab12806818331b5
Reviewed-on: https://code.wireshark.org/review/19086
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoandroiddump: Add support for Bluetooth on Android 7.0
Michal Labedzki [Thu, 3 Nov 2016 09:46:25 +0000 (10:46 +0100)]
androiddump: Add support for Bluetooth on Android 7.0

Now "ps" command does not support process name as parameter,
use grep instead.

Change-Id: I0c35bc7d560e237e4140000e67af097744cb2c1b
Reviewed-on: https://code.wireshark.org/review/19087
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoSMB: Limit Export object files to 32 bits.
Michael Mann [Mon, 5 Dec 2016 01:27:35 +0000 (20:27 -0500)]
SMB: Limit Export object files to 32 bits.

Most of the file offset fields are 32-bit, but the algorithms use gsize
variables, which can vary between 32 and 64 bit builds.  The 64-bit
builds are the ones with the problem with "garbage" data comes from
(effectively) invalid 32-bit offsets.

Bug: 11133
Change-Id: I20b8cafb75fc021594159ab092c18c24f3e257e3
Reviewed-on: https://code.wireshark.org/review/19073
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 agoHonor protocols.display_hidden_proto_items preferences when outputting fields in...
Michael Mann [Mon, 5 Dec 2016 03:29:14 +0000 (22:29 -0500)]
Honor protocols.display_hidden_proto_items preferences when outputting fields in TShark

Bug: 13192
Change-Id: Ibb2b3913716d31a3d5f600e1b6400fdf14a69ca4
Reviewed-on: https://code.wireshark.org/review/19075
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 agoClean up initialization code for programs.
Guy Harris [Mon, 5 Dec 2016 04:25:51 +0000 (20:25 -0800)]
Clean up initialization code for programs.

Make the init_progfile_dir() call unconditionally, even if plugins
aren't supported, as that doesn't necessarily mean nobody uses the
directory containing the executable.

Report the error the same way in all programs, and free the error string
after we're finished with it.

Make the error - and the comment before the code - reflect what
init_progfile_dir() is actually doing (the goal is to get the full
pathname of the directory *containing* the executable; that's generally
done by getting the pathname of the executable and stripping off the
name of the executable, but that's won't necessarily always be the
case).  Also note for TShark that we won't be able to capture traffic,
just as we do for Wireshark (if we don't have the pathname of the
program file, we don't have a pathname to use to find dumpcap).

Have the plugin scanner just fail silently if we weren't able to get the
plugin directory path, so we don't have to worry about calling it if
init_progfile_dir() fails.

Clean up white space while we're at it.

Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8
Reviewed-on: https://code.wireshark.org/review/19076
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoUpdate a comment to reflect current reality.
Guy Harris [Mon, 5 Dec 2016 03:21:19 +0000 (19:21 -0800)]
Update a comment to reflect current reality.

Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448
Reviewed-on: https://code.wireshark.org/review/19074
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agocmake: Fix building with plugins disabled
Peter Wu [Mon, 28 Nov 2016 23:44:56 +0000 (00:44 +0100)]
cmake: Fix building with plugins disabled

When Lua is enabled, scripts can still be loaded from the plugin dir
(filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the
cmake build fails.

Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6
Reviewed-on: https://code.wireshark.org/review/18976
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: Michael Mann <mmann78@netscape.net>
7 years agoReflect API changes.
Guy Harris [Sun, 4 Dec 2016 22:25:10 +0000 (14:25 -0800)]
Reflect API changes.

Change-Id: I6a8d50cb697bcd4a5232dc01107c7d9618258d87
Reviewed-on: https://code.wireshark.org/review/19071
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRawshark uses libwiretap, so it has to call wtap_init().
Guy Harris [Sun, 4 Dec 2016 22:20:37 +0000 (14:20 -0800)]
Rawshark uses libwiretap, so it has to call wtap_init().

Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a
Reviewed-on: https://code.wireshark.org/review/19070
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoHave a routine to do all the work of initializing libwiretap.
Guy Harris [Sun, 4 Dec 2016 21:42:07 +0000 (13:42 -0800)]
Have a routine to do all the work of initializing libwiretap.

Have programs that use libwiretap call that routine rather than
separately calling some or all of init_open_routines(),
wtap_register_plugin_types(), and wtap_opttypes_initialize().

Also don't have routines internal to libwiretap call those.  Yes, this
means doing some initialization work when it isn't necessary, but
scattering on-demand calls throughout the code is a great way to forget
to make those calls.

Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710
Reviewed-on: https://code.wireshark.org/review/19069
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoShow codec information in About dialog
Peter Wu [Mon, 28 Nov 2016 23:58:40 +0000 (00:58 +0100)]
Show codec information in About dialog

Show codec libraries in About dialog, this should give the user a clue
of what codecs are available.

SBC is already supported, Spandsp (for G.722/G.726) is work in progress.

Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b
Reviewed-on: https://code.wireshark.org/review/18978
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agocodecs: allow it to be used without plugins
Peter Wu [Mon, 28 Nov 2016 23:53:23 +0000 (00:53 +0100)]
codecs: allow it to be used without plugins

Not all codecs require the plugin infrastructure. For example, G.711U/A
is a built-in codec. Allow such functionality to be registered even if
plugin support is disabled.

Change-Id: I2505cc9955e7953268ec0739531278921f70a771
Reviewed-on: https://code.wireshark.org/review/18977
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years ago[Automatic update for 2016-12-04]
Gerald Combs [Sun, 4 Dec 2016 16:13:20 +0000 (08:13 -0800)]
[Automatic update for 2016-12-04]

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

Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f
Reviewed-on: https://code.wireshark.org/review/19066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoQt: clear Export Objects list on retapping
Peter Wu [Sat, 3 Dec 2016 22:41:08 +0000 (23:41 +0100)]
Qt: clear Export Objects list on retapping

The tap reset callback should not just invoke the reset callback of the
dissector, but also clear the previous list of objects in the dialog.
Otherwise duplicate entries will be created every time retapping occurs
(e.g. on changing the display filter).

Bug: 12230
Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c
Reviewed-on: https://code.wireshark.org/review/19055
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: Peter Wu <peter@lekensteyn.nl>
7 years agossh: fix the heuristic for MAC size determination
Роман Донченко [Thu, 1 Dec 2016 20:25:55 +0000 (23:25 +0300)]
ssh: fix the heuristic for MAC size determination

size_str points to a dash, so the result of calling ws_strtoi32 on it is
a negative number, which becomes a huge positive number, because size is
a guint32.

Parse the number after the dash instead, and use ws_strtou32.

Also, check that size is divisible by 8, since otherwise it's unlikely
to be a bit length.

Change-Id: I531f67d45e9e914574d36a9ffceed9239fd46d64
Reviewed-on: https://code.wireshark.org/review/19006
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoHave separate merge APIs for regular file/temporary file/standard output.
Guy Harris [Sun, 4 Dec 2016 01:57:34 +0000 (17:57 -0800)]
Have separate merge APIs for regular file/temporary file/standard output.

This is similar to what we have for opening a dump file - one API that
uses the file name as specified, one that creates a temporary file and
provides the file name, and one that uses the standard output.

All of those APIs handle closing the output file.

Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1
Reviewed-on: https://code.wireshark.org/review/19059
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoSquelch a casting-away-constness warning.
Guy Harris [Sun, 4 Dec 2016 03:02:36 +0000 (19:02 -0800)]
Squelch a casting-away-constness warning.

Change-Id: I77ca8ffd38baf812ef20b9611f59cd70ae37d392
Reviewed-on: https://code.wireshark.org/review/19062
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRemove unnecessary cast (gchar = char) that removes const.
Guy Harris [Sun, 4 Dec 2016 02:54:15 +0000 (18:54 -0800)]
Remove unnecessary cast (gchar = char) that removes const.

Change-Id: I3924c2b4a525c0ae5ab57b7f9867296586d78509
Reviewed-on: https://code.wireshark.org/review/19061
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoUpdate list of symbols.
Guy Harris [Sun, 4 Dec 2016 02:47:16 +0000 (18:47 -0800)]
Update list of symbols.

Remove symbols from plugins; they're not part of libwireshark.

Put all the get_rtd_ symbols together.

Add some new symbols.

Change-Id: I724ca7fd19ad083b7e05526a30974c23fa321e0b
Reviewed-on: https://code.wireshark.org/review/19060
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoUse ws_close(), rather than the UN*X-only close().
Guy Harris [Sat, 3 Dec 2016 23:15:39 +0000 (15:15 -0800)]
Use ws_close(), rather than the UN*X-only close().

Change-Id: Iae29db90273191c10455e172bdd2aac00b12143c
Reviewed-on: https://code.wireshark.org/review/19058
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoGet rid of test printout.
Guy Harris [Sat, 3 Dec 2016 23:14:31 +0000 (15:14 -0800)]
Get rid of test printout.

Change-Id: I0db268b0f7010d23c938ae56674cc5cd6c0bd998
Reviewed-on: https://code.wireshark.org/review/19057
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoWhen opening the standard output for writing, dup it.
Guy Harris [Sat, 3 Dec 2016 22:17:08 +0000 (14:17 -0800)]
When opening the standard output for writing, dup it.

That way, we can close the resulting wtap_dumper the same way we close
any other wtap_dumper, including closing the FD, rather than trying to
do everything *except* closing the FD (which is tricky for a FILE *).

Change-Id: I8cb66e32784d73e598b2e8720a12f9bdab1c6205
Reviewed-on: https://code.wireshark.org/review/19054
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agossh: dissect the host key when the connection uses DH group exchange
Роман Донченко [Fri, 2 Dec 2016 23:49:37 +0000 (02:49 +0300)]
ssh: dissect the host key when the connection uses DH group exchange

After this, hf_ssh_kexdh_host_key is no longer used, so remove it.

Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d
Reviewed-on: https://code.wireshark.org/review/19052
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoinstall_rpms_for_devel: add optional packages.
Dario Lombardo [Sun, 27 Nov 2016 19:05:32 +0000 (19:05 +0000)]
install_rpms_for_devel: add optional packages.

Install all optional dependencies as reported by cmake.

Tested on Centos7, openSUSE Leap 41.1, Fedora 24.
Fedora 24 is shipped with lua5.3, that is not compatible
with the current master, then it is not enabled.

Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea
Reviewed-on: https://code.wireshark.org/review/18968
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agopacket-infiniband: Fixed duplicate conversation entries
Parav Pandit [Tue, 29 Nov 2016 03:40:55 +0000 (22:40 -0500)]
packet-infiniband: Fixed duplicate conversation entries

1. Fixed find_conversation for PT_IBQP to not lookup in reverse
direction when all searches fail.
This is required, because there could be valid different connection in
reverse direction which mistakenly gets updated for non template cases.

2. Added support for having MAD data for upper level dissectors to process
during RC packet processing.
This is required because connection options are negotiated out of band
using this CM exchanges (unlike in band TCP options).

3. Moved creating unidirectional connections when actually MAD packets
are processed.
Previously client-to-server unidirectional conversation was created when
CM_RSP stage, where MAD Data of CM_REQ packet is inaccessible.

4. Fixed creating multiple conversations with same address property by
eliminating create_conv_and_add_proto_data during RTU stage, which was
incorrect.
Now they are created during REQ and RSP frame processing. (Instead of
RSP and RTU processing).

5. Added support for creating bidirectional connection that ULP can
refer.
This is required to keep track of oustanding transactions on a
connection (requests and responses).

Bug: 11363
Change-Id: I32ea084a581a58efbc16dbb7a3e267c82622c50c
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/18982
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 agotshark: Add -G folders report
Jim Young [Fri, 2 Dec 2016 05:56:22 +0000 (00:56 -0500)]
tshark: Add -G folders report

Add a new tshark feature to generate a folders report.  The folders report
is essentially the information presented by Wireshark's About / Folders page
in a TAB delimited format.

Change-Id: Ic4b3d332b4bdaa7e6b7aad1e9cc5dd18413aada6
Reviewed-on: https://code.wireshark.org/review/19002
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoTemporarily break up complicated expression into a bunch of separate ifs.
Guy Harris [Sat, 3 Dec 2016 04:08:40 +0000 (20:08 -0800)]
Temporarily break up complicated expression into a bunch of separate ifs.

Maybe this way we can identify which *particular* test is, according to
Valgrind, looking at uninitialized data; there's nothing obvious that
shows up from inspecting the code, and neither of our static analyzers
seem to have found anything.

Change-Id: I80f6bb8e6fa92decfe195c01766330b97e980821
Reviewed-on: https://code.wireshark.org/review/19049
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agopacket-rpcrdma: Fix protocol frame pre-detection
Chuck Lever [Wed, 9 Nov 2016 15:06:45 +0000 (10:06 -0500)]
packet-rpcrdma: Fix protocol frame pre-detection

The current mechanism of detecting RPC-over-RDMA is broken because
it treats the Read list as a counted array (it's a list); and treats
the Write list and Reply chunk identically (one is a list, one is
always a single chunk).

While we're here, refactor pre-detection helper functions so they
can be used during frame dissection as well.

Bug: 13196
Change-Id: I76e210c8d2a9464fed00e7199072d37f4ebbebf2
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19025
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoecho: decide on req/resp based on matched port
Jaap Keuter [Wed, 30 Nov 2016 17:00:12 +0000 (18:00 +0100)]
echo: decide on req/resp based on matched port

Since the use of 'Decode as' can result in another port number than the
default port (7) being the service port, this should be checked against.

Change-Id: I93383613115595fff621e2fb9ab7959cd448c01e
Reviewed-on: https://code.wireshark.org/review/18991
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: Peter Wu <peter@lekensteyn.nl>
7 years agopacket-rpcrdma: Display length and version fields in decimal
Chuck Lever [Wed, 9 Nov 2016 14:48:50 +0000 (09:48 -0500)]
packet-rpcrdma: Display length and version fields in decimal

Display length fields in decimal, just as they are displayed by the
RDMA RETH dissector.

Display version fields in decimal, just as they are displayed by the
RPC dissector.

RDMA offset fields are left in hexadecimal since they are
essentially addresses, and at least the Linux RPC-over-RDMA
implementation has debugging messages that display these as
hexadecimal values.

Change-Id: I7206970675ca0ca486b3a2837b6dbb1c4d764091
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19028
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoInclude config.h first, for large-file-related #defines.
Guy Harris [Fri, 2 Dec 2016 21:15:41 +0000 (13:15 -0800)]
Include config.h first, for large-file-related #defines.

Change-Id: Iced77fb65c2db8bc370cefe4c48c972fe1262f92
Reviewed-on: https://code.wireshark.org/review/19039
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agopacket-rpcrdma: Dissector should exit when frame is not RPC-over-RDMA
Chuck Lever [Wed, 9 Nov 2016 15:06:45 +0000 (10:06 -0500)]
packet-rpcrdma: Dissector should exit when frame is not RPC-over-RDMA

On an RDMA transport, RPC protocol never appears in a frame by
itself. If RPC-over-RDMA is not present, then RPC is by definition
not present as an InfiniBand data payload.

Bug: 13195
Change-Id: Icaea9d4936477af32adc73140c67539e977a7a9a
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19024
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoInclude config.h first, for large-file-related #defines.
Guy Harris [Fri, 2 Dec 2016 21:05:53 +0000 (13:05 -0800)]
Include config.h first, for large-file-related #defines.

Change-Id: Id71326bc89e1461b100df99b618a1c49256b93af
Reviewed-on: https://code.wireshark.org/review/19037
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoInclude config.h at the very beginning of all Flex scanners.
Guy Harris [Fri, 2 Dec 2016 19:18:50 +0000 (11:18 -0800)]
Include config.h at the very beginning of all Flex scanners.

That way, if we #define anything for large file support, that's done
before we include any system header files that either depend on that
definition or that define it themselves if it's not already defined.

Change-Id: I9b07344151103be337899dead44d6960715d6813
Reviewed-on: https://code.wireshark.org/review/19035
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMake SMB2 MessageId field a FT_UINT64
Michael Mann [Fri, 2 Dec 2016 16:57:43 +0000 (11:57 -0500)]
Make SMB2 MessageId field a FT_UINT64

Also adjust the smb2_info_t structure that handles the value.

Bug: 12915
Change-Id: Ia314b8dc840b9d26d2c1d185f06ef93f242a3a7b
Reviewed-on: https://code.wireshark.org/review/19019
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 agoPut tap-exportobject.h into the release tarball.
Guy Harris [Fri, 2 Dec 2016 18:27:51 +0000 (10:27 -0800)]
Put tap-exportobject.h into the release tarball.

Change-Id: I5c103c5b513c32c5de0ea90956f9049fd6b0edec
Reviewed-on: https://code.wireshark.org/review/19022
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoEnable exporting objects with tshark
Moshe Kaplan [Thu, 24 Nov 2016 14:37:01 +0000 (09:37 -0500)]
Enable exporting objects with tshark

A new "--export-object <protocol>,<destdir>" option is added to tshark.

This required refactoring Export Object behavior in all GUIs to give the
export object handling to the dissector, rather than the ui layer.
Included in the refactoring was fixing some serious memory leaks in Qt
Export Object dialog, crash due to memory scope issues in GTK Export
Object dialog, and addition sorting column feature in Qt dialog (set
up by creating a widget to manage the items that were previously
leaking memory)

Bug: 9319
Ping-Bug: 13174
Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b
Reviewed-on: https://code.wireshark.org/review/18927
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBOOTP: Fix V-I Vendor-Specific Information Option
Jaap Keuter [Wed, 30 Nov 2016 22:37:32 +0000 (23:37 +0100)]
BOOTP: Fix V-I Vendor-Specific Information Option

Apply the same value checks to the vendor generic suboption dissection
as is done for the Cable lab and ADSL forum ones.
See https://ask.wireshark.org/questions/57695 for an example issue.

Change-Id: I4fe07d07cf0a93f4693e5ff54dd70c008701cf41
Reviewed-on: https://code.wireshark.org/review/18999
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: Michael Mann <mmann78@netscape.net>
7 years agoautotools: fix typo.
Dario Lombardo [Fri, 2 Dec 2016 09:19:12 +0000 (10:19 +0100)]
autotools: fix typo.

The required executable is rpmbuild and not rpm.

Change-Id: Iba1bff9c7fb6907659451a977ad8ab98efb169da
Reviewed-on: https://code.wireshark.org/review/19015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agosimple_dialog(.h): fix parameter 'Type' not found in the function declaration [-Wdocu...
Alexis La Goutte [Fri, 2 Dec 2016 08:26:29 +0000 (09:26 +0100)]
simple_dialog(.h): fix parameter 'Type' not found in the function declaration [-Wdocumentation]

Change-Id: I3dc476af941221b1d59f31bd6f639a49059e38a9
Reviewed-on: https://code.wireshark.org/review/19014
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoMake sure config.h is included before inet_addr.h.
Guy Harris [Fri, 2 Dec 2016 10:32:39 +0000 (02:32 -0800)]
Make sure config.h is included before inet_addr.h.

Otherwise, _FILE_OFFSET_BITS might be defined by a header file included
by inet_addr.h before it gets defined by config.h.

Change-Id: I5987b3f1493b81fd2d427d9792b9606117b255d0
Reviewed-on: https://code.wireshark.org/review/19018
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDo *NOT* strip newlines from the standard input of sed.
Guy Harris [Fri, 2 Dec 2016 09:29:26 +0000 (01:29 -0800)]
Do *NOT* strip newlines from the standard input of sed.

There is *NO* guarantee that sed will do anything useful with input that
doesn't have a newline and, in fact, the default sed in Solaris 11
doesn't produce *any* output if you hand it input with no newline.

Furthermore, doing xxx=`yyy` will, if the output of yyy has newlines at
the end, strip them; to quote section 2.6.3 "Command Substitution" of
the Single UNIX Specification:

The shell shall expand the command substitution by executing
command in a subshell environment (see Shell Execution
Environment) and replacing the command substitution (the text of
command plus the enclosing "$()" or backquotes) with the
standard output of the command, removing sequences of one or
more <newline> characters at the end of the substitution.

so there's no need to strip the newline.

Change-Id: Ia710f67a42739c1e218eb9fec53a54bde6e010da
Reviewed-on: https://code.wireshark.org/review/19016
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoQt: Fix QStyledItemDelegate assertions.
Gerald Combs [Thu, 1 Dec 2016 22:32:29 +0000 (14:32 -0800)]
Qt: Fix QStyledItemDelegate assertions.

QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex.
We were doing this in PercentBarDelegate and TimelineDelegate in order to
keep it from drawing any text. Return an empty string from ::displayText
instead, which appears to be the correct way to paint without text.

Bug: 13180
Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0
Reviewed-on: https://code.wireshark.org/review/19007
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoThe Kerberos dissector include Kerberos header, and needs KRB5_CFLAGS.
Guy Harris [Fri, 2 Dec 2016 02:24:58 +0000 (18:24 -0800)]
The Kerberos dissector include Kerberos header, and needs KRB5_CFLAGS.

Change-Id: I9a0e6ff09292fafca970e8ff423f18a835b5f2c4
Reviewed-on: https://code.wireshark.org/review/19011
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoPrefs: Use g_utf8_strlen instead of strlen.
Gerald Combs [Fri, 2 Dec 2016 00:15:10 +0000 (16:15 -0800)]
Prefs: Use g_utf8_strlen instead of strlen.

Change-Id: I99e2906b3c31f4aebcda44f4433f0fdd457ced3b
Reviewed-on: https://code.wireshark.org/review/19008
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoClean up error messages.
Guy Harris [Fri, 2 Dec 2016 00:42:30 +0000 (16:42 -0800)]
Clean up error messages.

Also, use elif in some chains of tests, to make it a bit clearer that
the cases in question are disjoint.

Change-Id: I6dc92d536450c7ac3db6ee118581a5ed0c3ce80c
Reviewed-on: https://code.wireshark.org/review/19009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRPM: fix the date in a recent changelog entry.
Jeff Morriss [Thu, 1 Dec 2016 18:04:08 +0000 (13:04 -0500)]
RPM: fix the date in a recent changelog entry.

RPM complains when the date isn't valid.

Change-Id: I859a9900ba87d52159071b06310d5873c092231a
Reviewed-on: https://code.wireshark.org/review/19003
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agossh: add DSA host key dissection
Роман Донченко [Wed, 30 Nov 2016 22:44:52 +0000 (01:44 +0300)]
ssh: add DSA host key dissection

Change-Id: Ib1e2b4e57832e94b94d34102c0079f820b18f350
Reviewed-on: https://code.wireshark.org/review/19000
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoCheck preference titles and descriptions.
Gerald Combs [Tue, 20 Sep 2016 21:11:29 +0000 (14:11 -0700)]
Check preference titles and descriptions.

When registering preferences, make sure our titles and descriptions are
valid UTF-8. Make sure our titles are short and only contain printable
characters.

Fix problematic titles and descriptions.

Change-Id: I20d3f93438f2b3c30266f934297feb79897f2ee5
Reviewed-on: https://code.wireshark.org/review/18998
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 agoQt: fix crash when closing RTP player while playing
Peter Wu [Mon, 28 Nov 2016 14:53:59 +0000 (15:53 +0100)]
Qt: fix crash when closing RTP player while playing

For some time, the RTP Player has been crashing for me (Arch Linux, Qt
5.7.0) when the RTP Player is active (affects also Wireshark 2.0.5).

This call trace was observed:

    + RtpPlayerDialog::reject (closing dialog via Escape / Close button)
      + RtpAudioStream::stopPlaying
        + RtpAudioStream::outputStateChanged(QAudio::StoppedState)
          + QAudioOutput::deleteLater   // problematic!
      + RtpPlayerDialog::~RtpPlayerDialog
        + RtpAudioStream::~RtpAudioStream

As the QAudioOutput instance is a child of RtpAudioStream, it is also
destroyed after that. QAudioOutput's destructor somehow invokes (via
libqtmedia_pulse.so) a main loop iteration which invokes the previously
scheduled deleteLater call.

As QAudioOutput was already being destructed, this results in a crash.
Workaround this by removing this child from RtpAudioStream (no cruelty
intended).

Change-Id: I88f2e929ac566534be5d2270e2e0b194685533eb
Reviewed-on: https://code.wireshark.org/review/18970
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoQt: Fix simple_dialog formatting.
Gerald Combs [Tue, 29 Nov 2016 17:32:47 +0000 (09:32 -0800)]
Qt: Fix simple_dialog formatting.

Make sure that simple_dialog displays plain text. Trim whitespace
and remove excessive newlines in order to improve message formatting.
Add a comment about simple_dialog's behavior in Qt and GTK+ and how it
might be improved.

Bug: 13178
Change-Id: Ic6ff3cecd5ef1d76ec095d7a409f38e602b41ce2
Reviewed-on: https://code.wireshark.org/review/18985
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agossl,dtls: add expert info for overly large record lengths
Peter Wu [Sat, 26 Nov 2016 13:39:24 +0000 (14:39 +0100)]
ssl,dtls: add expert info for overly large record lengths

All TLS and DTLS RFCs (and SSLv3) limit the record length to 2^14, so
add expert info if this is exceeded. Spotted in the wild via
https://ask.wireshark.org/questions/57641/tls12-record-length-gt-16k-valid

Tested with a synthetic pcap having length 2^14+1 using Python:

    from scapy.all import IP, TCP, UDP, wrpcap
    len_plus_frag = b'\x40\x01' + 0x4001 * b'\0'
    wrpcap('bad-record-length.pcap', [
    IP()/TCP(sport=2000, dport=443)/(b'\x17\x03\x03' + len_plus_frag),
    IP()/UDP(sport=2000, dport=853)/(b'\x17\xfe\xfd' + 8*b'\0' + len_plus_frag)
    ])

Change-Id: I5eac48775333d8d222e013a24a6d06da79892b77
Reviewed-on: https://code.wireshark.org/review/18959
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agosip: register with Websocket dissector (RFC 7118)
Peter Wu [Wed, 30 Nov 2016 11:24:18 +0000 (12:24 +0100)]
sip: register with Websocket dissector (RFC 7118)

The subprotocol is also listed in the IANA registry at
https://www.iana.org/assignments/websocket/websocket.xhtml#subprotocol-name

Tested with the pcap from the linked bug.

Bug: 11420
Change-Id: I4ba8e6c55889f72f5aca37c4ae759e2cd20a22b7
Reviewed-on: https://code.wireshark.org/review/18989
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 agoFix the build when a different version of Qt is in PATH
Роман Донченко [Tue, 29 Nov 2016 23:11:06 +0000 (02:11 +0300)]
Fix the build when a different version of Qt is in PATH

When we add our Qt to PATH, prepend it so that it will be found first.

Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9
Reviewed-on: https://code.wireshark.org/review/18988
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
7 years agoQt: fix GoToPacket when Voip Calls dialog is closed
Peter Wu [Wed, 23 Nov 2016 15:28:34 +0000 (16:28 +0100)]
Qt: fix GoToPacket when Voip Calls dialog is closed

After opening the Call Flows dialog from the Voip Calls dialog, followed
by closing the Voip Calls dialog, the Go To Packet functionality in the
Call Flows dialog is broken. That happens because the signal is not
proxied anymore.

Just remove all these indirections via signals and directly update the
selected packet.

Change-Id: I9c6d519dbe800e4dfdf0407d832f17819b344e46
Reviewed-on: https://code.wireshark.org/review/18933
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years ago3GPP NAS: shorten some value_string to avoid truncation during display
Pascal Quantin [Tue, 29 Nov 2016 13:27:35 +0000 (14:27 +0100)]
3GPP NAS: shorten some value_string to avoid truncation during display

Change-Id: I50f9bbec5405c17a59c5eaac9833929737b8c145
Reviewed-on: https://code.wireshark.org/review/18984
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoHandle FT_CHAR, and report unsupported types as such.
Guy Harris [Tue, 29 Nov 2016 03:16:55 +0000 (19:16 -0800)]
Handle FT_CHAR, and report unsupported types as such.

FT_CHAR is straightforward to support.

Split the list of "invalid" types into a list of "unsupported" types and
a short list of "invalid" types, containing FT_PCRE (which isn't a valid
type for a field) and "everything else".  Add FT_IEEE_11073_SFLOAT and
FT_IEEE_11073_FLOAT to the "unsupported" list.

Flag the whole unsupported list as just "not handled yet".

Change-Id: I62d2d7eead53377e4e601594a035b4395fdbeead
Reviewed-on: https://code.wireshark.org/review/18979
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years ago3GPP NAS: add an expert info when APN encoding exceeds 100 bytes
Pascal Quantin [Mon, 28 Nov 2016 15:34:46 +0000 (16:34 +0100)]
3GPP NAS: add an expert info when APN encoding exceeds 100 bytes

As stated in 3GPP 23.003:
"the APN has, after encoding as defined in the paragraph below,
a maximum length of 100 octets"

Change-Id: Iae23117f44ea5b668f6cb23dbd0e726e4e56ce41
Reviewed-on: https://code.wireshark.org/review/18972
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 agoQt: Position UAT hint label just below the list.
Stig Bjørlykke [Sun, 27 Nov 2016 19:54:45 +0000 (20:54 +0100)]
Qt: Position UAT hint label just below the list.

Place the UAT hint label at the same position as in other dialogs;
just below the main widget.  Also use smaller font and italic.

Change-Id: I51251825ff08122e17ca60144ef53fed5c6142ef
Reviewed-on: https://code.wireshark.org/review/18969
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoQt: Update UAT OK button enabled on delete.
Stig Bjørlykke [Sun, 27 Nov 2016 19:08:26 +0000 (20:08 +0100)]
Qt: Update UAT OK button enabled on delete.

Check if the OK button should be enabled when removing a row in a
UAT dialog.  Also update the error hint.

Change-Id: Icb5c47c2b2e65ed266fd2c7e3a1535f6a3a50279
Reviewed-on: https://code.wireshark.org/review/18967
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoQt: Fix conversation buttons.
Gerald Combs [Sun, 27 Nov 2016 00:31:19 +0000 (18:31 -0600)]
Qt: Fix conversation buttons.

Move parts of currentTabChanged to conversationSelectionChanged. This
lets us enable the "Follow Stream" and "Graph" buttons when either the
current tab or the current selection changes.

Bug: 12893
Change-Id: I025447d26073a938f2d8b5a8fcad7c0d5e855650
Reviewed-on: https://code.wireshark.org/review/18963
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoQt: fix heap-use-after-free when double-clicking a packet number
Peter Wu [Mon, 28 Nov 2016 15:50:25 +0000 (16:50 +0100)]
Qt: fix heap-use-after-free when double-clicking a packet number

On double-clicking a packet number, the current field item is
invalidated by goToPacket. Skip the URL since a field can either have a
URL or a frame number (but not both).

Change-Id: I58e5445fa74071fa0fd203df77ebdecdd1478d31
Reviewed-on: https://code.wireshark.org/review/18971
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoUpdate message on outdated precommit hook
Matthieu Coudron [Sat, 26 Nov 2016 18:18:37 +0000 (19:18 +0100)]
Update message on outdated precommit hook

Change-Id: I3afb93cced09df7844c0810438ee6d760f8237a5
Reviewed-on: https://code.wireshark.org/review/18960
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years ago[Automatic update for 2016-11-27]
Gerald Combs [Sun, 27 Nov 2016 16:14:07 +0000 (08:14 -0800)]
[Automatic update for 2016-11-27]

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

Change-Id: I3dae07ff98d80f02d1aaf7408e81faf6614d7058
Reviewed-on: https://code.wireshark.org/review/18964
Reviewed-by: Gerald Combs <gerald@wireshark.org>