git.samba.org - metze/wireshark/wip.git/log

Qt: Set maximumSize on AccordionFrame widget buttons

After switching to QPushButton for buttons in SearchFrame and GoToFrame
the widgets needs a maximum size to reduce the height of the frame.

Change-Id: I504e65add446c4262e9b1e02ff3e41c08d1cfdfd
Reviewed-on: https://code.wireshark.org/review/14019
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Couchbase: Dissect optional expiry in subdoc mutation requests

Add support for dissecting the optional 4-byte expiry field in
sub-document API request packets. This is permitted for any
single-path mutation request; increasing the length of the extras
section from 3 to 7 bytes.

Change-Id: I0609dbc6f6a8e62028cd20a28609fc3016e44910
Reviewed-on: https://code.wireshark.org/review/14004
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: Alexis La Goutte <alexis.lagoutte@gmail.com>

Put back a define to make the Lua build happy.

DO NOT USE THIS FOR ANYTHING NEW.

Change-Id: Iee2ddaa2eeb735b33aef9e81b32bb4a3535e3451
Reviewed-on: https://code.wireshark.org/review/14023
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Get rid of PCAP_ENCAP_USB.

It doesn't correspond to anything we support - and the old Linux USB
LINKTYPE_ value of 186 doesn't give enough information to dissect the
packets (it discards the event type, for example), so we drop the rest
of our support for it as well.

Change-Id: I6f537d9263174aba4320edf5140e1d1540e979c8
Reviewed-on: https://code.wireshark.org/review/14020
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix implicit conversion from 64 to 32 bits

Change size_t to something that is guaranteed to fit in a socklen_t.

Fix incorrect AC_DEFINE too.

Change-Id: I710f32fb1e5bd4f51843d380aa8ed8b6acd98c02
Reviewed-on: https://code.wireshark.org/review/14009
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

Qt: Fix Open protocol preferences button.

Do showProtocolPreferences before removing the variable which
this depends on. The button does not work without at module.

Change-Id: I7d31aa5ab19340a4102523b13de961e799cae5e4
Reviewed-on: https://code.wireshark.org/review/14015
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

rsl: avoid buffer overread

Fixes a buffer overrun in dissct_rsl_ipaccess_msg when the tag is
exactly 0xff:

tag = tvb_get_guint8(tvb, offset);
tdef = &rsl_att_tlvdef.def[tag];

Bug: 11829
Change-Id: I25a3c6948242a52f59431ce84c108b2e52008930
Reviewed-on: https://code.wireshark.org/review/14011
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Add inet_pton/inet_ntop interface to libwsutil

Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f
Reviewed-on: https://code.wireshark.org/review/13881
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>

BER/PER: Add dissector assertions to squelch scan-build bugs

packet-per.c:959:6: warning: Access to field 'aligned' results in a dereference of a null pointer (loaded from variable 'actx')
packet-ber.c:1606:29: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx')
packet-ber.c:1612:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx')
packet-ber.c:3156:41: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx')
packet-ber.c:3182:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx')

Change-Id: Ibae00dc29a869701fe903a5b0c9944279aaa3df7
Reviewed-on: https://code.wireshark.org/review/13936
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>

DLM3: Add support for the Need Slots Recovery Command Status Flag

DLM3 minor version 1, introduced in mainline kernel commit 757a4271 from
October 2011, added some fields and a Need Slots flag to Recovery
Command Status packets.

Change-Id: Ib994223afeae6b8d6ddb75404ab2031c5a63185b
Reviewed-on: https://code.wireshark.org/review/13983
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>

Qt: Update AccordionFrame widgets to use common layout

- Use QPushButton for buttons and set the "Find" button as default
  in SearchFrame.
- Use QPushButton for buttons, added a "Packet:" label, and set
  the "Go to packet" button as default in GoToFrame.
- Set Qt::WA_MacSmallSize in OS X for FilterExpressionFrame and
  PreferenceEditorFrame.
- Removed QFrame::StyledPanel and QFrame::Raised from ColumnEditorFrame.
- Update ui files to reflect that AccordionFrame is used for
  AddressEditorFrame, FilterExpressionFrame and PreferenceEditorFrame.

Change-Id: Icfbfff973535317997109a1020dfe24ba932e098
Reviewed-on: https://code.wireshark.org/review/13995
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Don't call the hci_usb dissector through a dissector table.

It works the same regardless of what flavor of USB metadata there is,
and there's no good reason for any Bluetooth code to know, or care,
about particular flavors of USB metadata.

Add some comments while we're at it.

Change-Id: I6ea2063a015e424fc84a407231e80ef3e2a79c98
Reviewed-on: https://code.wireshark.org/review/14001
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ssl: fix decryption when session ticket is not used

Do not use the client-supplied session ticket for decryption when the
session is not resumed as the cached key (associated with that ticket)
is invalid for this new session. SSL Session IDs are unaffected by this
issue as only the server-issued Session ID is considered.

This fixes decryption of a SSL capture which uses the keylog file for
decryption, but where the session tickets are invalid because the server
was restarted.

Additionally, the session and session tickets stores are split to avoid
exporting session tickets via File -> Export SSL Session keys. Session
tickets should only be used internally, the CLIENT_RANDOM identifier is
shorter and is the preferred method to link secrets.

Change-Id: If96d7a4e89389825478e67e9a65401ce0607aa66
Reviewed-on: https://code.wireshark.org/review/13994
Reviewed-by: Michael Mann <mmann78@netscape.net>

Prevent inproper use of negative value

Coverity rightfully complains about inproper use of negative value.
maxlength special value '-1' should be handled appropriately.

Change-Id: Ie1818121e39fa668094d012980016444ca868e6e
Reviewed-on: https://code.wireshark.org/review/13978
Reviewed-by: João Valverde <j@v6e.pt>
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>

dcerpc: fix Called function pointer is null (null dereference) found by Clang Analyzer

Change-Id: Idf98bcf617d4d6343aa233e42898cf5f26b08e33
Reviewed-on: https://code.wireshark.org/review/13974
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>

Added support for Payload IE Vendor OUI.

IEEE has run out of Payload IE IDs so ZigBee and
future IEs must use Vendor OUIs.

Change-Id: I6eed4382d099364605649eb7577a5e2691e97dd3
Reviewed-on: https://code.wireshark.org/review/13971
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>

Don't bother setting phdr->pkt_encap to wth->file_encap.

wtap_read() and wtap_seek_read() now do so before calling the read or
seek-read routine, so there's no need to do so in those routines.

Rename hcidump_process_packet() to hcidump_read_packet() while we're at
it, as it doesn't just process an already-read packet, it does the
reading as well as the processing.

Change-Id: Ic13da6a2096e68550d80f2eff31f03d0edb58147
Reviewed-on: https://code.wireshark.org/review/13998
Reviewed-by: Guy Harris <guy@alum.mit.edu>

PPP: remove obsolete Van Jacobson decompression preference

As discussed in https://www.wireshark.org/lists/wireshark-dev/201309/msg00182.html
VJ decompressor was removed from Wireshark 1.12 due to license incompatibility
Let's mark the corresponding preference as obsolete so that people do not think
it is still supported

Change-Id: I7030ef5f402a0c7e242e77a52baf18f450a95024
Ping-Bug: 12138
Reviewed-on: https://code.wireshark.org/review/13993
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>

Have ETT variable names all begin with ett_.

Change-Id: I2f6b3e569206e443291f7473ed77b2acde636748
Reviewed-on: https://code.wireshark.org/review/13997
Reviewed-by: Guy Harris <guy@alum.mit.edu>

802.15.4 fixed processing of PAN ID compression bit

This the result of updated 'PAN ID Compression field value for frame
version 0b10' table in IEEE spec which clarifies the interpretaion
of the PAN ID Compression bits for different combinations of Src
and Dst Addresses.

Change-Id: Ia70836b8571beae80a3f507be4f39736e13eb110
Reviewed-on: https://code.wireshark.org/review/13984
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: Pascal Quantin <pascal.quantin@gmail.com>

Remove some {-I,/I} flags.

They should not be necessary.

Change-Id: I9246d86862392c65839c18d13d8634bcf510d55e
Reviewed-on: https://code.wireshark.org/review/13992
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>

Another include that needs fixing.

Change-Id: If06ba1bd887e0e47d74c9b75cbabedcfd7b84130
Reviewed-on: https://code.wireshark.org/review/13991
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't add the wiretap directory to the list of include directories.

If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
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>

EIGRP: Add missing CD (Candidate Default) flag on Legacy Metric

According to the EIGRP draft RFC (https://tools.ietf.org/html/draft-savage-eigrp-04#section-6.8.1), 2nd bit (0x2) in EIGRP classic bit field should be interpreted as Candidate Default (CD)

Reported by Garri

Bug:12136
Change-Id: I56dcbbc7db480e67962e2edfbd8d9c6b117f30ef
Reviewed-on: https://code.wireshark.org/review/13987
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>

Qt: Add regex support in Find Packet

Add support for using regular expressions in the Search Frame
when searching in packet list, packet details and packet bytes.

This search is in many cases faster than plain string search.

Change-Id: I2d8a709046f90d7b278fb39547fc4e2e420623bc
Reviewed-on: https://code.wireshark.org/review/13981
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

GTPv2 command messages conversation

Change-Id: I2faa01b3c461269e5c8ed88ef44157fbc33758b9
Reviewed-on: https://code.wireshark.org/review/13980
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>

Fix compilation of extcap programs with NMake

Change-Id: I80e17aeeab5bf747c6ba06168245d38d6d78efa9
Reviewed-on: https://code.wireshark.org/review/13986
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

cip: fix a leak

Change g_list into wmem_list to solve the leak. Leak found by valgrind.

==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418
==14755==    at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==14755==    by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14755==    by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14755==    by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==14755==    by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402)
==14755==    by 0x67CD825: proto_register_cip (packet-cip.c:8067)
==14755==    by 0x71C83F9: register_all_protocols (register.c:229)
==14755==    by 0x65F14D7: proto_init (proto.c:521)
==14755==    by 0x65CF961: epan_init (epan.c:126)
==14755==    by 0x1153F0: main (tshark.c:1220)

Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3
Reviewed-on: https://code.wireshark.org/review/13969
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

usb: cleanup idProduct dissection

The current code which dissects the idProduct (and to some extend the
idVendor) item for USB devices is overly complicated. A better method
to format the product string in the right way is using:
proto_tree_add_uint_format_value.

This gets rid of the additinal string and item manipulation altogether.

Change-Id: Iadd69b7dc284e62039402de53418f41460d88a5d
Reviewed-on: https://code.wireshark.org/review/13973
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Qt: Validate FindLineEdit regexp

Check if regexp is valid and set valid/invalid background color.

Change-Id: Ibf4d3fa84463afbd7c68631cfaddec8261807b8f
Reviewed-on: https://code.wireshark.org/review/13962
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

autotools: Remove extra space from output

Change-Id: If50c6b5d15d44ed3d99a82bd0ca08f93ee059ce3
Reviewed-on: https://code.wireshark.org/review/13979
Reviewed-by: João Valverde <j@v6e.pt>

Cast away a warning.

The argument to the resize method for QByteArray is an int, not a
size_t.

Change-Id: Id30bc03daec6d6ead8669794b5cb0247718be66b
Reviewed-on: https://code.wireshark.org/review/13977
Reviewed-by: Guy Harris <guy@alum.mit.edu>

iso14443: fix the NAK/ACK bit of an R-block

if the bit is set, it's an R(NAK) block

Change-Id: I0e44bd72d1c2a69a582792d08bf450e6ef2d163b
Reviewed-on: https://code.wireshark.org/review/13976
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

Qt: Add Decode as in Show Packet Bytes

Add an option to decode the packet bytes from base64 or zlib compressed.
Also add configurable start byte and end byte to make it possible to
decode a subset of bytes. It's also possible to select a range in ASCII
view and select "Show selected" from the context menu to make a subset.

In ASCII view a null terminator is replaced by UTF8 symbol for NULL,
and a CR is replaced by UTF8 symbol for carriage return. This is done
to make it possible to "Show selected" from the context menu.

Change-Id: Ie03c9912c304c121af6ca9e998a6e8445b5382c5
Reviewed-on: https://code.wireshark.org/review/13958
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add packet-usbip.h to epan/dissectors/Makefile.common file

Change-Id: Idb9dc545da7b1a1957facd243806f0459ffb7e0b
Reviewed-on: https://code.wireshark.org/review/13972
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

USBIP: add USBIP Protocol dissector

This patch adds support for the USBIP protocol [0]. A document
describing the protocol in detail is available from the linux
kernel source [1].

The USBIP protocol mimics a USB HCD on a client PC that tunnels
USB data over TCP/IP between the client and the host where the
physical USB device is connected.

A testcase has been submitted to bug.wireshark.org [2].

[0] <http://usbip.sourceforge.net/>
[1] <https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/usbip/usbip_protocol.txt>
[2] <https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12127>

Bug: 12127
Change-Id: I4e557dc274017eb029c7af2717a62be4b00aebda
Reviewed-on: https://code.wireshark.org/review/13797
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Update Debian symbols.

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

ws80211: Replace some whitespaces with tabs

File had both whitespaces and tabs for indentation. Replace
whitespace indentation with tabs. This is the same indentation
mode as ws80211.c file uses.

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

RTPS: Added new locator kinds and upgraded to latest set of ids

The standard says that UDPv6 is the index 2. However, the dissector
contained the old implementation of RTI DDS (which had SHMEM = 2
and UDPv6 = 5). I have updated the dissector to be compliant with
the standard and indirectly be compliant with the new version of
RTI DDS which now implements the standard in this aspect.

Change-Id: Iaade0e457fda35362c04a7658d62242cf8868127
Reviewed-on: https://code.wireshark.org/review/13922
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>

IRDP: Use integer arithmetic to round-up [-Wbad-function-cast]

Change-Id: Idef58b23b7ec0b52ca10c0ce5304bf840252e043
Reviewed-on: https://code.wireshark.org/review/13935
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>

CIP/ENIP: Attribute updates

1. More Identity attributes
2. Port attributes
3. Set Attribute List request highlighted too much attribute data
4. TCP/IP object, Attr 5 needs padding
5. Switch most attributes to use wrappers instead of dissect_epath() directly.
6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats.

Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19
Reviewed-on: https://code.wireshark.org/review/13898
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>

const gpointer -> gconstpointer

'const gpointer' is the same as 'void *const'. Replace with gconstpointer
where straightforward (assuming that was the intent) and use gpointer everywhere
else for clarity (that does not change *API* constness contract; it just means
a variable is not declared immutable inside the called funtion).

Change-Id: Iad2ef13205bfb4ff0056b2bce056353b58942267
Reviewed-on: https://code.wireshark.org/review/13945
Petri-Dish: Anders Broman <a.broman58@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>

iso14443: fix the order of the ATS bytes

TL and T0 are followed by TA(1), TB(1) and TC(1), in this order

Change-Id: I356da8bb475d55f36e5b9ff02d35fcf35c457223
Reviewed-on: https://code.wireshark.org/review/13961
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

iso14443: dissect FWI in the ATS

use the same hf as for ATQB's FWI

Change-Id: I2c1db117688e16e91fc4072d9b6f4bba46f64fd6
Reviewed-on: https://code.wireshark.org/review/13960
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

iso14443: move ATS dissection to a separate function

Change-Id: I04d9b610aac0f5387870be63b1d0dde9940bfa5b
Reviewed-on: https://code.wireshark.org/review/13959
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

Allow test of the -D and -L options to succeed or fail with a permissions error.

We cannot easily predict what will happen, given the configuration of
the OS, the permissions on files, the availability of extcap devices,
the version of libpcap/WinPcap/NPcap (present or future), etc., etc.,
etc.. Allow those tests to succeed (as would be the case if you have
the necessary permissions) or fail with a non-command-line-syntax error
(as would be the case if you don't have the necessary permissions), but
not to fail with a command-line syntax error.

Change-Id: I76af898d5f146fcf3507c06f101acb578085e6fa
Reviewed-on: https://code.wireshark.org/review/13957
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Qt: Add FindLineEdit with regex search option

Add settings to the QLineEdit context menu to use textual or regular
expression search. Use this in Follow Stream and Show Packet Bytes.

Change-Id: I3a9f5a923f616629aa40a334921871f98b518f30
Reviewed-on: https://code.wireshark.org/review/13942
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Use cast to char for explicit conversion [-Woverflow]

Change-Id: If33cf41f46f2be9c66fc4a626af6a2c010fba7d3
Reviewed-on: https://code.wireshark.org/review/13931
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>

multipart: Add Content-Description header

Change-Id: I10432e813832cf6facc33bf3c06872bd9611a4c5
Reviewed-on: https://code.wireshark.org/review/13954
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

[UMTS-FP] Try to fix Bug 12121 out of bounds access by expanding an array.

Bug: 12121
Change-Id: Ie7dc2a27ba3ad1ad81b301ca4d41fa2d6c485206
Reviewed-on: https://code.wireshark.org/review/13955
Reviewed-by: Anders Broman <a.broman58@gmail.com>

More changes reflecting the extcap binaries being built in extcap.

Change-Id: I1b14a160f3c9a48811ae68ade31969231dd1a627
Reviewed-on: https://code.wireshark.org/review/13953
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Some more randpkt_core.

Change-Id: I62181a2b2664095a818e9adefce79b59b4510a34
Reviewed-on: https://code.wireshark.org/review/13952
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Correctly set the "short GI" flag in the generic radio information structure.

For 802.11n, if the GI length is present in the MCS field and is "short
GI", "gi_length" is equal to 1, not to 0, so set the "short GI" flag in
the generic radio information to "gi_length".

Bug: 12123
Change-Id: Ica2c5794698a643a6393f0468cdbfe025aa90074
Reviewed-on: https://code.wireshark.org/review/13950
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix name of librandpkt_core.

Also, add it to the list of dependencies.

Change-Id: I424c0657c87ab97d704b86a3b0722fb7f33b9f49
Reviewed-on: https://code.wireshark.org/review/13949
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Generate randpkt_core/doxygen.cfg.

Change-Id: I22417f39f124ffdfd9fd0304605d7a301752c2a3
Reviewed-on: https://code.wireshark.org/review/13948
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add randpkt_core to the list of libraries for randpkt.

Also, get rid of the stuff for the extcap programs, as that's now
handled by extcap/Makefile.nmake.

Change-Id: Ide94c1cfc97d50e5d9fabbb923d9c52cccb62fa0
Reviewed-on: https://code.wireshark.org/review/13947
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Build the extcap programs in the extcap directory.

That lets the version of Wireshark built with autotools find the extcap
programs.

Don't install the extcap programs under ${datadir} - that puts it under
a share directory, and share directories are for platform-independent
files, which executable images aren't (they're instruction-set
dependent, hence platform-dependent).

Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f
Reviewed-on: https://code.wireshark.org/review/13943
Reviewed-by: Guy Harris <guy@alum.mit.edu>

IMAP: Indentation

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

editcap: flag for ignore vlan duplication removal

Add additional --novlan flag for removing vlan tag info before checking for duplicates.
When capturing with -i any you could see packets more than once and some drivers include vlan info.
With the --novlan the vlan info is removed from the packet so that checksum duplication detection can be used,
if the rest of the packets are the same.

Change-Id: I5dca6e20259a0a396875919e9e60cc42291579d3
Reviewed-on: https://code.wireshark.org/review/13414
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>

Add some casts to void * to fix (pedantic) argument mismatch notes

Change-Id: I63e46285b4c6676d4ae57196b85fbad89964898c
Reviewed-on: https://code.wireshark.org/review/13933
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>

Fix format string warnings [-Wformat=]

Change-Id: I266c7d422f6ade965b42a4e2e8dc01966f8eb5f8
Reviewed-on: https://code.wireshark.org/review/13932
Reviewed-by: João Valverde <j@v6e.pt>

LWM: Fix "Assigned value is garbage or undefined"

From scan-build:
packet-lwm.c:466:33: warning: Assigned value is garbage or undefined

Change-Id: Ib9e1cfd3f9462d0bbb5a87ae4d323c333878323d
Reviewed-on: https://code.wireshark.org/review/13937
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>
Reviewed-by: João Valverde <j@v6e.pt>

Fix two warnings for semcheck.c

semcheck.c:986:24: warning: cast from function call of type 'sttype_id_t' to non-matching type 'int' [-Wbad-function-cast]
semcheck.c:986:5: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'struct stnode_t *' [-Wformat=]

Change-Id: I83031251c83f6597eb7c31f35e02c5a95bd2dabb
Reviewed-on: https://code.wireshark.org/review/13930
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>

tango_color(.h): avoid ‘tango_butter_3’ defined but not used [-Werror=unused-const-variable] found by gcc6

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

Sort UTF8 entities

Change-Id: I804dc16c3dd04e57556e095bf82a81afe257f03c
Reviewed-on: https://code.wireshark.org/review/13941
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

[Automatic update for 2016-02-14]

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

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

Register Q.931 in the osinl.incl dissector table.

Have the Frame Relay dissector first check the fr.osinl table and then
the osinl.incl table, so that it finds Q.933 rather than Q.931 for an
NLPID of 0x08.

Change-Id: I1582482003c2ff96100f6c3e1eb77917ab04c9ee
Reviewed-on: https://code.wireshark.org/review/13929
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Just #include wsutil/inet_aton.h

No need for platform-specific system header boilerplate.

Change-Id: I5387a0005ddb0d7aab3c5b9f28d6282053c1b0fd
Reviewed-on: https://code.wireshark.org/review/13865
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>

Don't define EXTCAP_DIR as "${datadir}/wireshark/extcap".

If you hand that string to a UNIX API, it'll probably fail; you need to
expand ${datadir} in the *build* process.

Do it the same way we handle PLUGIN_INSTALL_DIR.

Change-Id: I09e8a8467ab7b0e912a174be3335ee1faff91abb
Reviewed-on: https://code.wireshark.org/review/13928
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add support for libssh.

Change-Id: Iffb0ea15c76659f5c1f73e2b7b11bcfdeb859c6a
Reviewed-on: https://code.wireshark.org/review/13925
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

Fix an indentation to get rid of
text2pcap.c:1254:17: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]

Change-Id: Ifa031f5faad3445bcd3ab893d83c5dc6386fe3a2
Reviewed-on: https://code.wireshark.org/review/13927
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

androiddump: fix logical ‘or’ of equal expressions [-Werror=logical-op] found by gcc6

EAGAIN and EWOULDBLOCK is the same value (now)
http://www-numi.fnal.gov/offline_software/srt_public_context/WebDocs/Errors/unix_system_errors.html

Change-Id: Ia8101d05194910f306e8439507ae5bde3ccd00ce
Reviewed-on: https://code.wireshark.org/review/13905
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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: Roland Knall <rknall@gmail.com>

Dissection of SSAPs is a bit weird. 0x1 would be displayed as ">Unknown (0x01)"
on my particular trace. This duplicates the value with the C/R-bit set. Needs
a proper fix eventually.
Small indentation fix.

Change-Id: I6bf7c560b5161994b8d90d7ae70724c03c6df73b
Reviewed-on: https://code.wireshark.org/review/13926
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

iso14443: verify the CRC of all messages

define a function to dissect the CRC depending on the card type

add a circuit for an activated card to keep track of the card type

define a new circuit type CT_ISO1443 for this purpose, the circuit ID is
always 0 as we support only a single active card

Change-Id: I7250f834301612ba50743258ca7bdbe0199de3ea
Reviewed-on: https://code.wireshark.org/review/13908
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

packetbb: Add some descriptions for message and TLV types

Change-Id: I2f1455cf50d9a90a516194ed09d7f6d6932e3afe
Reviewed-on: https://code.wireshark.org/review/13912
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>

TIPC: remove unneeded semicolon

Change-Id: I471ea1a322b921c45b62dbada73f486ec907c3a6
Reviewed-on: https://code.wireshark.org/review/13923
Reviewed-by: João Valverde <j@v6e.pt>

umts_fp: fix ... defined but not used [-Werror=unused-const-variable] found by gcc6

Change-Id: I5866ea2d6a08a90799882b0c4626d0ed215069a8
error: ‘fake_lchid_macd_flow’ defined but not used [-Werror=unused-const-variable]
error: ‘hsdsch_macdflow_id_mac_content_map’ defined but not used [-Werror=unused-const-variable]
error: ‘hsdsch_macdflow_id_rlc_map’ defined but not used [-Werror=unused-const-variable]
Reviewed-on: https://code.wireshark.org/review/13871
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>

tap-iostat: fix logical ‘or’ of equal expressions [-Werror=logical-op] found by gcc6

Change-Id: Ic10ba8df57ae69994f7ac0e6ddbdec92af797fc8
Reviewed-on: https://code.wireshark.org/review/13920
Reviewed-by: Michael Mann <mmann78@netscape.net>

file: fix variable ‘progbar’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] found by gcc6

Change-Id: I24a2d48968826c079e696b8136d32929508a26dd
Reviewed-on: https://code.wireshark.org/review/13921
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

unistim: fix broadcast_phone_msgs’ defined but not used [-Werror=unused-const-variable] found by gcc6

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

Profinet (pn-mrp): fix statement is indented as if it were guarded by... [-Werror=misleading-indentation] found by gcc6

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

packetbb: Fix the default value for end-index

RFC5444 §5.4.1 specifies that for address block TLVs:
end-index := <num-addr>-1
when both thassingleindex and thasmultiindex = 0.
It was incorrectly initialized to <num-addr> when <num-addr>!=0
(i.e for address block TLVs).

Change-Id: I4a78f263ffb122c0d6c0b54b4e8d1d6d525353e0
Reviewed-on: https://code.wireshark.org/review/13911
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Adjust time stamps even if the secs value of the time stamp is 0.

If the seconds value in a time stamp is 0, that says nothing whatsoever
about whether it's supported or not - it's the presence flag, which
we've already tested and found to be set, that indicates whether the
time stamp is supported.

Bug: 12116
Change-Id: I91354783af7b6356d9806c7559d35da44ea4567f
Reviewed-on: https://code.wireshark.org/review/13913
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add in a default value for extended_port_offset to avoid warning (-> error)
with gcc-4.4.x

Change-Id: I823787dd7c4c92d74cd294e6e2d44b3574ae4d20
Reviewed-on: https://code.wireshark.org/review/13909
Reviewed-by: Michael Mann <mmann78@netscape.net>

flexray: add a dissector for flexray protocol

Bug: 12033
Change-Id: I04ad97933639b1c6192608d12a1fb72f4c3725e2
Reviewed-on: https://code.wireshark.org/review/13576
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

RTPS: Adding position in the batch to the rtps_dissector_data

Adding this information is useful for custom dissectors so they can
add it to the display. When a lot of samples are sent in RTPS in
the same batch, it is very helpful to have the index in the display.

Change-Id: I0f158eeb9d5e9b4fcf67ef6e72dcfa655b9cc427
Reviewed-on: https://code.wireshark.org/review/13875
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>

Qt: Add Show as C Array and YAML in Show Packet Bytes

Change-Id: Ib9ccd72128f55741d4c94cf849f8e0f8866c2cb7
Reviewed-on: https://code.wireshark.org/review/13907
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

CoAP: Add support for tracking requests and responses

Use CoAP's token to match responses to requests in CoAP.

Change-Id: I13141e3490d54aa27aea7c94d8199dcc0166d493
Reviewed-on: https://code.wireshark.org/review/13859
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>

nstrace: Allow opening of files that are not multiples of 16kB
in size.

Wireshark/Tshark hangs when netscaler trace file smaller than 16KB is opened.
It also hangs when a gzipped trace file is opened. With this fix,
Files with sizes that are not multiple of 16KB and gzipped files can be opened.

Bug: 12083
Change-Id: I26b2fc406edafcb2f1f6161d69064ba5662ddf29
Reviewed-on: https://code.wireshark.org/review/13721
Reviewed-by: Michael Mann <mmann78@netscape.net>

USB Audio: Fix cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]

Change-Id: Ie50ecb88ad1ea5f95b5772d71a6a4b02f06c4e2f
Reviewed-on: https://code.wireshark.org/review/13817
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

WHO: Remove cast to fix warning [-Wbad-function-cast]

Change-Id: I711c51fb4a141c76b904169b5d3eb797198cdc73
Reviewed-on: https://code.wireshark.org/review/13892
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

autotools: Add more silent build rules

Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea
Reviewed-on: https://code.wireshark.org/review/13816
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>

Change some constness qualifications

Change-Id: I0ece488f43aae27e7c055c2edacbf09ff11ce16d
Reviewed-on: https://code.wireshark.org/review/13889
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

AES: Fix dereference of null pointer

Change-Id: Iddd21c8786e679eef51024a172403200ee6652cb
Reviewed-on: https://code.wireshark.org/review/13902
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: Alexis La Goutte <alexis.lagoutte@gmail.com>

[GTP] In GTP' version 0 the 20 byte header is 6 bytes followed by 14 0
bytes.

Bug: 12063
Change-Id: Ie1e98626b605f08835812c944acf58d57f383fae
Reviewed-on: https://code.wireshark.org/review/13854
Reviewed-by: Anders Broman <a.broman58@gmail.com>

atn cm/cpdlc : fix variable ‘atn_cv’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] found by gcc6

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

Use CMake conventional nomenclature for CXX_FLAGS

Change-Id: I2b67eed2bb04412b9d556e616fe3233176fac5bc
Reviewed-on: https://code.wireshark.org/review/13883
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: Anders Broman <a.broman58@gmail.com>

[NBAP] Array hsdsch_macdflow_id_rlc_map should be 8 elements.

Bug: 12112
Change-Id: I3d3fd822b291d459613030dda122963a72c13ee6
Reviewed-on: https://code.wireshark.org/review/13901
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>