metze/wireshark/wip.git
3 years agoqt: show marker when capture file comment has changed
Peter Wu [Fri, 19 Feb 2016 17:27:44 +0000 (18:27 +0100)]
qt: show marker when capture file comment has changed

Fixes a missing "*" marker in the title and this warning when the
capture file comment is modified:

    QWidget::setWindowModified: The window title does not contain a '[*]' placeholder

Change-Id: Iea0a63cf8c8f9abd577397c8881f0399d2e798ba
Reviewed-on: https://code.wireshark.org/review/14010
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agoExtend reassembly documentation
Peter Wu [Sun, 21 Feb 2016 23:54:50 +0000 (00:54 +0100)]
Extend reassembly documentation

Documentation changes only (comments and docbook).

Update WSDG with the fragment_add_seq_check API that was introduced in
Wireshark 1.10.

Fix typos and clarify the many functions we have for adding reassembling
fragments.

Change-Id: I38715a8f58e9cf1fe3e34ee4b1a4ae339630282b
Reviewed-on: https://code.wireshark.org/review/14066
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>
3 years agober: avoid deep recursion for constructed strings
Peter Wu [Wed, 24 Feb 2016 02:06:46 +0000 (03:06 +0100)]
ber: avoid deep recursion for constructed strings

Bound the recursion depth to avoid a stack overflow while parsing a
deeply nested constructed string.

Call chain before this patch:

 - dissect_ber_octet_string
   - dissect_ber_constrained_octet_string
     - reassemble_octet_string (called for constructed types)
       - dissect_ber_octet_string *recursion*

After this patch, the reassemble_octet_string will throw if the maximum
recursion depth is reached.

Bug: 11822
Change-Id: I6753e3c9f5dcbfab0e4c174418b2c7eb784d64d2
Reviewed-on: https://code.wireshark.org/review/14108
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>
3 years agovwr: fix heap-based buffer overflow
Peter Wu [Tue, 23 Feb 2016 23:35:44 +0000 (00:35 +0100)]
vwr: fix heap-based buffer overflow

Commit v1.99.10rc0-316-gf28e23f added some additional room for the 16
byte PLCP header and 1 byte L1P. These are however not part of the
remaining data, only the header.

Bug: 11795
Change-Id: Ia6935d27366a07f818f147c9094a801429b049e2
Reviewed-on: https://code.wireshark.org/review/12240
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
3 years agoDe-canonicalize paths for file and directory path preferences.
Guy Harris [Wed, 24 Feb 2016 05:09:04 +0000 (21:09 -0800)]
De-canonicalize paths for file and directory path preferences.

Undo Qt's "helpful" canonicalization of paths returned by the file
dialogs to use / as the pathname component separator rather than using
the native pathname component separator.

Bug: 12117
Change-Id: I6077191a2204574ca50f53b5424f7f421db33db3
Reviewed-on: https://code.wireshark.org/review/14109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agocmake: fix docbook dependency
Peter Wu [Sun, 21 Feb 2016 23:44:48 +0000 (00:44 +0100)]
cmake: fix docbook dependency

After changing an asciidoc source file, the html files were not rebuilt
via 'ninja developer_guides'. It turns out that the
developer_guide_docbook target has an order-only dependency on
developer-guide.xml (and not the developer-guide.xml dependencies).

Fix this by adding an explicit dependency on the generated .xml file.

Change-Id: I4bdc0ebca8909caaab9cc0797cc35cc6260bfe43
Reviewed-on: https://code.wireshark.org/review/14065
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: Graham Bloice <graham.bloice@trihedral.com>
3 years agoWhen installing RPMs for development, use dnf if the OS has it.
Jeff Morriss [Fri, 12 Feb 2016 02:46:33 +0000 (21:46 -0500)]
When installing RPMs for development, use dnf if the OS has it.

Also install the Qt5-devel packages (in addition to plain old "Qt").

Change-Id: I86f6a779dc9d0b359c69f0627106d1cce3120f83
Reviewed-on: https://code.wireshark.org/review/13916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agofix exists multiple times with NOT compatible types: IPv4/IPv6/Bytes
Alexis La Goutte [Tue, 23 Feb 2016 13:05:28 +0000 (14:05 +0100)]
fix exists multiple times with NOT compatible types: IPv4/IPv6/Bytes

'rsip.parameter.address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'sap.originating_source' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'sflow_245.nexthop' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: Idabe9adafac2e11f2e90a494e5fac1a341edca33
Reviewed-on: https://code.wireshark.org/review/14091
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>
3 years agoGet rid of trailing white space.
Guy Harris [Tue, 23 Feb 2016 20:09:25 +0000 (12:09 -0800)]
Get rid of trailing white space.

Change-Id: I8a42826ae5aa864ee21e1a96a5826642d66a7e63
Reviewed-on: https://code.wireshark.org/review/14104
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDissect the frame data.
Guy Harris [Tue, 23 Feb 2016 20:07:38 +0000 (12:07 -0800)]
Dissect the frame data.

We just dissect it as raw bytes for now; ultimately, we need to process
it the same way we process data for other forms of USB capture.

This also catches the case where the frame length is bogusly large
(including so large that rounding it up to a multiple of 4 overflows).

Bug: 12153
Change-Id: I537974d548fdcda917d9fce8189eb2134bc17bb9
Reviewed-on: https://code.wireshark.org/review/14103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoQt: Add tooltips to the welcome screen interfaces.
Gerald Combs [Sat, 13 Feb 2016 01:13:40 +0000 (17:13 -0800)]
Qt: Add tooltips to the welcome screen interfaces.

Show the interface address and saved capture filter.

Change-Id: I8403f97ea584783abdbe2d89b8c9061a00ececdf
Reviewed-on: https://code.wireshark.org/review/14100
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoQt: Select matching tree item and bytes in Find Packet
Stig Bjørlykke [Tue, 23 Feb 2016 08:30:48 +0000 (09:30 +0100)]
Qt: Select matching tree item and bytes in Find Packet

Highlight the matching tree item and matching packet bytes when
doing a Find Packet.  Added cf->search_len to correctly highlight
the matching bytes when doing a regex search.

Bug: 12157
Change-Id: I84fbdb9b43be4355e24aff3cf5f8850f1119e2bf
Reviewed-on: https://code.wireshark.org/review/14086
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>
3 years agoQt: Optimize Show Packet Bytes
Stig Bjørlykke [Tue, 23 Feb 2016 08:37:20 +0000 (09:37 +0100)]
Qt: Optimize Show Packet Bytes

Change-Id: Ia81f501d5495125d3633af729051e185609353e0
Reviewed-on: https://code.wireshark.org/review/14087
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>
3 years agoQt: add OS interface description to 'Manage Local Interfaces' window
Pascal Quantin [Tue, 23 Feb 2016 16:01:16 +0000 (18:01 +0200)]
Qt: add OS interface description to 'Manage Local Interfaces' window

In case the user did not provide a custom name for the interface, display the
OS description in the 'Comment' column as how it is done in GTK UI.

Bug: 12156
Change-Id: If9da58980169df3eaf25f74e7b81676cbc4f6ebd
Reviewed-on: https://code.wireshark.org/review/14095
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoQt: Capture and display filter fixups.
Gerald Combs [Mon, 22 Feb 2016 21:39:49 +0000 (13:39 -0800)]
Qt: Capture and display filter fixups.

In SyntaxLineEdit make sure we emit textEdited when we complete a
previously used filter. In CaptureInterfacesDialog, connect
captureFilterComboBox::activated to filterEdited. These enusre that we
fill in the capture filter column in CaptureInterfacesDialog.

Change-Id: Ibbf7ab223e37f8f73d8ec0289f8c32692a7e17d4
Reviewed-on: https://code.wireshark.org/review/14081
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoautotools: Display build flags in configure summary
João Valverde [Sun, 21 Feb 2016 20:31:00 +0000 (20:31 +0000)]
autotools: Display build flags in configure summary

Add more AX_APPEND_FLAGS to handle whitespace better too.

Change-Id: I679fc76076c2d800e3524fe7bf22d0af8e58b284
Reviewed-on: https://code.wireshark.org/review/14062
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoBGP-LS: Protocol-ID aware Prefix/Adj Flags dissection
Francesco Fondelli [Tue, 16 Feb 2016 15:12:21 +0000 (16:12 +0100)]
BGP-LS: Protocol-ID aware Prefix/Adj Flags dissection

BGP-LS is just a collector of IGP link state information. Some
fields are encoded "as-is" from the IGP, hence in order to dissect
them properly we must be aware of their origin, e.g. IS-IS or OSPF.
So, *before* dissecting LINK_STATE attributes we must get the
'Protocol-ID' field that is present in the MP_[UN]REACH_NLRI
attribute. The tricky thing is that there is no strict order for path
attributes on the wire, hence we have to keep track of 1) the
'Protocol-ID' from the MP_[UN]REACH_NLRI and 2) the offset/len of
the LINK_STATE attribute. We store them in per-packet proto_data and
once we got both we are ready for the LINK_STATE attribute dissection.

Change-Id: Ibe2b7f5c9039ad63a72f3f9fb8a9c33c0be44ed0
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/13970
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>
3 years agoHave "make maintainer-clean" remove extcap/Makefile.in.
Guy Harris [Tue, 23 Feb 2016 03:06:16 +0000 (19:06 -0800)]
Have "make maintainer-clean" remove extcap/Makefile.in.

(Is there some reason why automake doesn't make this happen by default?)

Change-Id: I1a4fff32696012d0fd83faf86a2f40df4ea5fa80
Reviewed-on: https://code.wireshark.org/review/14085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoExplicitly require autoconf 2.64.
Guy Harris [Tue, 23 Feb 2016 02:45:30 +0000 (18:45 -0800)]
Explicitly require autoconf 2.64.

AX_APPEND_FLAG requires it, and we use AX_APPEND_FLAG, so explicitly
require it up front.

Change-Id: Ieff378e63eba245fdf1454bc388b6be7fc94a10c
Reviewed-on: https://code.wireshark.org/review/14084
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMaking wiretap option blocks more generic.
Michael Mann [Tue, 26 Jan 2016 01:17:21 +0000 (20:17 -0500)]
Making wiretap option blocks more generic.

This was inspired by https://code.wireshark.org/review/9729/, but takes it in a different direction where all options are put into an array, regardless of whether they are "standard" or "custom".  It should be easier to add "custom" options in this design. Some, but not all blocks have been converted.
Descriptions of some of the block options have been moved from wtap.h to pcapng.h as it seems to be the one that implements the description of the blocks.

Also what could be added/refactored is registering block behavior.

Change-Id: I3dffa38f0bb088f98749a4f97a3b7655baa4aa6a
Reviewed-on: https://code.wireshark.org/review/13667
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agowmem: add null-terminator support.
Dario Lombardo [Thu, 18 Feb 2016 10:32:07 +0000 (11:32 +0100)]
wmem: add null-terminator support.

This change makes wmem_array more similar to GArray by adding
two functions that mimic the first two params of g_array_new().

Change-Id: Iaec999cd2e44f79f44d766be5d39741b73602e5a
Reviewed-on: https://code.wireshark.org/review/13989
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
3 years agocaputils: fix crash when calling 'dumpcap -i' without having WinPcap installed
Pascal Quantin [Mon, 22 Feb 2016 15:53:13 +0000 (17:53 +0200)]
caputils: fix crash when calling 'dumpcap -i' without having WinPcap installed

Add a test on err_str buffer presence before trying to use it,
like what is done in other code paths.

Bug: 12143
Change-Id: I30ae49a33224dc190c202637767df9d7de2c0f2b
Reviewed-on: https://code.wireshark.org/review/14074
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoLTE RRC: add a unit to gnss-TOD-msec field
Pascal Quantin [Mon, 22 Feb 2016 15:11:41 +0000 (17:11 +0200)]
LTE RRC: add a unit to gnss-TOD-msec field

Change-Id: I48b15d47d9bdf1bb4078a03ee7183f05bb57fa04
Reviewed-on: https://code.wireshark.org/review/14072
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoHTTP2: Reduce resource usage.
Tatsuhiro Tsujikawa [Fri, 5 Feb 2016 14:41:57 +0000 (23:41 +0900)]
HTTP2: Reduce resource usage.

Cache decoded header fields in order to conserve memory.

If we try to decompress more than 256 KB or find 200 or more headers
stop decompressing and add an expert item. Note that we might want to
make the maximum values configurable via preferences.

Bug:12077
Change-Id: Idf7cb1046c96cf87e1b53af6c56e19b4abad1dfb
Reviewed-on: https://code.wireshark.org/review/13746
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoCisco Marker: Fix endian type for some field
Peter Membrey [Mon, 22 Feb 2016 03:21:30 +0000 (11:21 +0800)]
Cisco Marker: Fix endian type for some field

Fixed several decoded fields that were poorly described in the original documentation

Change-Id: I688c5fd7e011d0dd49fb201ca294348d177bb4fa
Reviewed-on: https://code.wireshark.org/review/14067
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoFix some hf_ field datatype conflicts.
Michael Mann [Mon, 22 Feb 2016 01:19:02 +0000 (20:19 -0500)]
Fix some hf_ field datatype conflicts.

'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES
'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING
'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES
'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES
'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER
'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN
'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8
'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32
'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d
Reviewed-on: https://code.wireshark.org/review/14070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agopacket-cigi.c: Fix conflicting datatypes for hf_ fields.
Michael Mann [Sun, 21 Feb 2016 23:46:36 +0000 (18:46 -0500)]
packet-cigi.c: Fix conflicting datatypes for hf_ fields.

'cigi.entity_control' exists multiple times with NOT compatible types: FT_FLOAT and FT_STRINGZ
'cigi.entity_control' exists multiple times with NOT compatible types: FT_STRINGZ and FT_FLOAT
'cigi.art_part_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.rate_control.part_id' exists multiple times with NOT compatible types: FT_UINT8 and FT_INT8
'cigi.view_control.yoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.view_control.zoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.view_control.roll_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.view_control.pitch_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.view_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
'cigi.short_symbol_control.value1' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32
'cigi.short_symbol_control.value2' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32

Also replace some homemade true_false_string with some from tfs.h

Change-Id: Ied8dfb320abb6f3218304fd06c5481167f1169ec
Reviewed-on: https://code.wireshark.org/review/14069
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoSeparate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.
Michael Mann [Sun, 21 Feb 2016 18:22:41 +0000 (13:22 -0500)]
Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.

'bitcoin.addr.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.inv.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getdata.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.notfound.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getblocks.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getheaders.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.input_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.in.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.output_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.out.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.block.num_transactions' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.headers.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.merkleblock.flags.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.merkleblock.hashes.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.string.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.data.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'dcerpc.referent_id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'dmp.body.id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'edonkey.start_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'edonkey.end_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.entry' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.phoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.shoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_vaddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_paddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_filesz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_memsz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_align' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_addr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_addralign' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_entsize' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.symbol_table.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.symbol_table.size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.tag' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.pointer' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.ignored' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.unspecified' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'h248.contextId' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'hcrt.data32' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'wlan_mgt.fixed.psmp.stainfo.reserved' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'isakmp.tf.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'isakmp.ike.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'jxta.message.element.content.length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'rmt-lct.tsi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'rmt-lct.toi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'smb.alloc_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'trmac.response_code' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32

Change-Id: I903933e6448bac3d3374eef1a6a0bc4771c1a9f4
Reviewed-on: https://code.wireshark.org/review/14060
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoResolve hf_ field name conflicts with protocol strings.
Michael Mann [Sun, 21 Feb 2016 19:24:11 +0000 (14:24 -0500)]
Resolve hf_ field name conflicts with protocol strings.

Change-Id: Ie719e2f14c6eaf536035ab30dcb40e91c431c6e4
Reviewed-on: https://code.wireshark.org/review/14061
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agopvfs2: read a 64bit value in one go
Martin Kaiser [Fri, 19 Feb 2016 18:48:08 +0000 (19:48 +0100)]
pvfs2: read a 64bit value in one go

Change-Id: If630e03f82add403cb978969a8ebbb6f0bbcbad0
Reviewed-on: https://code.wireshark.org/review/14064
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>
3 years agosigcomp: don't THROW() an exception from a dissector
Martin Kaiser [Fri, 19 Feb 2016 18:37:15 +0000 (19:37 +0100)]
sigcomp: don't THROW() an exception from a dissector

when there's a decompression failure, we already flag up an expert info and exit
we can just delete the exception

in dissect_udvm_reference_operand_memory(), we return 0 on error and
let the caller do a check

Change-Id: I2cd301896794260457f57209e5efc0939b27b339
Reviewed-on: https://code.wireshark.org/review/14063
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agotshark: load decode_as_entries file
Michael Mann [Sun, 21 Feb 2016 14:40:18 +0000 (09:40 -0500)]
tshark: load decode_as_entries file

With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality.
But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option.
Let's load decode_as_entries file by default and have it overridden by the '-d' option if required.

Ping-Bug: 12124
Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2
Reviewed-on: https://code.wireshark.org/review/13956
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>
3 years agoautotools: Add GLib/GTK configuration definitions to package cflags
João Valverde [Sun, 21 Feb 2016 10:58:30 +0000 (10:58 +0000)]
autotools: Add GLib/GTK configuration definitions to package cflags

Change-Id: I67e1d41ded89114db80dd33b966840fca6175eb0
Reviewed-on: https://code.wireshark.org/review/14048
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>
3 years agoautotools: Improve libnl configuration and dependency
João Valverde [Fri, 19 Feb 2016 05:05:00 +0000 (05:05 +0000)]
autotools: Improve libnl configuration and dependency

Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13
Reviewed-on: https://code.wireshark.org/review/14052
Petri-Dish: João Valverde <j@v6e.pt>
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: João Valverde <j@v6e.pt>
3 years ago[Automatic update for 2016-02-21]
Gerald Combs [Sun, 21 Feb 2016 16:10:40 +0000 (08:10 -0800)]
[Automatic update for 2016-02-21]

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

Change-Id: I80f7d5b45ef26dc4fb1ca34d549acfb2c0a54bcf
Reviewed-on: https://code.wireshark.org/review/14054
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years ago[SPICE] Prevent really long loop in dissect_spice_link_capabilities.
Michael Mann [Sun, 21 Feb 2016 13:46:22 +0000 (08:46 -0500)]
[SPICE] Prevent really long loop in dissect_spice_link_capabilities.

Not all paths will access the tvb to have it throw a bounds error for large loop values.

Bug: 12151
Change-Id: I74a6d0d8ddece0f95027493a7d408cc54d94d25a
Reviewed-on: https://code.wireshark.org/review/14051
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix typo in PTP / Follow_Up Message / Follow Up information TLV.
Michael Mann [Sun, 21 Feb 2016 13:25:40 +0000 (08:25 -0500)]
Fix typo in PTP / Follow_Up Message / Follow Up information TLV.

scaledLastGMPhaseChange -> scaledLastGmFreqChange

Bug: 12150
Change-Id: I7b3d58c7d59364acb029e87f42da464c8840b95a
Reviewed-on: https://code.wireshark.org/review/14050
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoautotools: Use pkg-config autoconf macros for GLib/GTK
João Valverde [Fri, 19 Feb 2016 08:20:35 +0000 (08:20 +0000)]
autotools: Use pkg-config autoconf macros for GLib/GTK

Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.

Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).

Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoautotools: Cleanup some installation directory stuff
João Valverde [Sat, 20 Feb 2016 13:13:35 +0000 (13:13 +0000)]
autotools: Cleanup some installation directory stuff

Replace hacky code to set install dirs in config.h and use path definitions
only where required.

Change-Id: I78735f730725382c1b3aca876705e5e6e1872d78
Reviewed-on: https://code.wireshark.org/review/14033
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoautotools: Fix multiple repetitions of -L build flags
João Valverde [Sat, 20 Feb 2016 16:18:59 +0000 (16:18 +0000)]
autotools: Fix multiple repetitions of -L build flags

Before:

  WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib'

After:

  WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib'

Bumps autoconf required version to 2.64.

Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a
Reviewed-on: https://code.wireshark.org/review/14041
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>
3 years agoNo need to export the 48-byte-header Linux USB dissector.
Guy Harris [Sun, 21 Feb 2016 02:01:35 +0000 (18:01 -0800)]
No need to export the 48-byte-header Linux USB dissector.

Nobody looks it up, so just register it in the wtap_encap table, as we
do with the 64-byte-header Linux USB dissector, the USBPCAP dissector,
and the FreeBSD USB dissector.

Change-Id: I5da098d799a63449f17a26924b3ba2de36536896
Reviewed-on: https://code.wireshark.org/review/14046
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDisssect the flags fields in the FreeBSD USB headers.
Guy Harris [Sun, 21 Feb 2016 00:55:52 +0000 (16:55 -0800)]
Disssect the flags fields in the FreeBSD USB headers.

Change-Id: I6f59028b1134378762691c35897cfcdc04e6dbfe
Reviewed-on: https://code.wireshark.org/review/14045
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoieee80211: handle reserved grouping value
Peter Wu [Sat, 20 Feb 2016 15:51:15 +0000 (16:51 +0100)]
ieee80211: handle reserved grouping value

Prevents a buffer overrun (read). Show expert info such that it can be
detected (in case the value is non-reserved in the future).

Bug: 11818
Change-Id: I6cd2f4c9deb5cb515a53743aa83193521b2331e8
Reviewed-on: https://code.wireshark.org/review/14040
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>
3 years agoMIP6: fix mip6.lri.reserved exists multiple times with NOT compatible types: FT_BOOLE...
Alexis La Goutte [Sat, 20 Feb 2016 15:32:07 +0000 (16:32 +0100)]
MIP6: fix mip6.lri.reserved exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT16

It is a typo on display field and fix also wrong comment...

Change-Id: Idb93641d6e4197b59e453e4ad629af4c0454c8d3
Reviewed-on: https://code.wireshark.org/review/14038
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoDLM3: Remove macro for declare header field (hf)
Alexis La Goutte [Fri, 19 Feb 2016 20:08:08 +0000 (21:08 +0100)]
DLM3: Remove macro for declare header field (hf)

checkhf don't like macro and for avoid warning/error, remove macro for declare hf

Change-Id: I5521b3176027ddc673e8f6c793ab4eb0d01cd8fd
Reviewed-on: https://code.wireshark.org/review/14018
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoMIH: fix exists multiple times with NOT compatible types
Alexis La Goutte [Sat, 20 Feb 2016 12:57:21 +0000 (13:57 +0100)]
MIH: fix exists multiple times with NOT compatible types

'mih.tlv_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8
'mih.mihf_id' exists multiple times with NOT compatible types: FT_ETHER and FT_STRING
'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv4 and FT_ETHER
'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: Ib4be551920c7389100ece668e1af288a7d712725
Reviewed-on: https://code.wireshark.org/review/14027
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix various off-by-one in buffer sizes
Peter Wu [Sat, 20 Feb 2016 15:02:54 +0000 (16:02 +0100)]
Fix various off-by-one in buffer sizes

Some only allow buffer overruns (read), others also buffer overflows
(write).

Found by looking for '\[ *N *\]' where N is 255, 0xff, 15 and 0xf (case
insensitive).

Change-Id: I250687e2fdeb8fbd5eaf0bbb8251c3dab9640760
Reviewed-on: https://code.wireshark.org/review/14034
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agober: fix buffer overrun when handling empty sets
Peter Wu [Sat, 20 Feb 2016 14:06:50 +0000 (15:06 +0100)]
ber: fix buffer overrun when handling empty sets

When a set is empty, only a terminator (ber_sequence_t with NULL func)
is present. In that case, do not try to find more values as that will
never succeed.

Bug: 12106
Change-Id: I26cd4ba84a9580e92d5921592a27c2af17c0bebf
Reviewed-on: https://code.wireshark.org/review/14028
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agogsm_abis_oml: fix buffer overrun
Peter Wu [Sat, 20 Feb 2016 14:27:40 +0000 (15:27 +0100)]
gsm_abis_oml: fix buffer overrun

Do not read outside boundaries when tag is exactly 0xff.

    tag = tvb_get_guint8(tvb, offset);
    tdef = find_tlv_tag(tag);
        ...
        return &nm_att_tlvdef_base.def[tag];

Bug: 11825
Change-Id: I42e624185abb2166aa0f8d0dbd71a2a86fc0b18e
Reviewed-on: https://code.wireshark.org/review/14030
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agosober: fix cannot optimize loops warning [-Wunsafe-loop-optimizations]
João Valverde [Fri, 12 Feb 2016 05:54:20 +0000 (05:54 +0000)]
sober: fix cannot optimize loops warning [-Wunsafe-loop-optimizations]

Change-Id: I180b1ef53f9adcf4625d0cf9ee35066aa21ee59b
Reviewed-on: https://code.wireshark.org/review/13934
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>
3 years agoautotools: Use Qt flags only for building Qt GUI
João Valverde [Thu, 18 Feb 2016 11:11:25 +0000 (11:11 +0000)]
autotools: Use Qt flags only for building Qt GUI

Change-Id: I041e2fab6de948c803cc059e78358077000efee8
Reviewed-on: https://code.wireshark.org/review/14006
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>
3 years agoQt: only "Comment" column should be editable in Local Interfaces management tab
Pascal Quantin [Fri, 19 Feb 2016 18:47:16 +0000 (19:47 +0100)]
Qt: only "Comment" column should be editable in Local Interfaces management tab

Bug: 12146
Change-Id: Ife481b7c0b201a54749e212416571aa3dcaf7542
Reviewed-on: https://code.wireshark.org/review/14017
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoautotools: Move common automake code for plugins to an include file
João Valverde [Fri, 19 Feb 2016 07:15:26 +0000 (07:15 +0000)]
autotools: Move common automake code for plugins to an include file

Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96
Reviewed-on: https://code.wireshark.org/review/14003
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoFix indentation.
Guy Harris [Sat, 20 Feb 2016 11:13:30 +0000 (03:13 -0800)]
Fix indentation.

Change-Id: I4737a3410cde2d8ead79b42d9734b4412cb5ca77
Reviewed-on: https://code.wireshark.org/review/14026
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoInitial support for FreeBSD USB captures.
Guy Harris [Sat, 20 Feb 2016 11:11:52 +0000 (03:11 -0800)]
Initial support for FreeBSD USB captures.

(There's also work needed in libpcap; that's also in progress.)

Change-Id: Iff5a34c139a000865e2d78cc17a4af5ff24fb44b
Reviewed-on: https://code.wireshark.org/review/14025
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoQt: Set maximumSize on AccordionFrame widget buttons
Stig Bjørlykke [Fri, 19 Feb 2016 22:29:05 +0000 (23:29 +0100)]
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>
3 years agoCouchbase: Dissect optional expiry in subdoc mutation requests
Dave Rigby [Fri, 19 Feb 2016 13:36:31 +0000 (13:36 +0000)]
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>
3 years agoPut back a define to make the Lua build happy.
Guy Harris [Sat, 20 Feb 2016 00:05:45 +0000 (16:05 -0800)]
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>
3 years agoGet rid of PCAP_ENCAP_USB.
Guy Harris [Fri, 19 Feb 2016 22:45:21 +0000 (14:45 -0800)]
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>
3 years agoFix implicit conversion from 64 to 32 bits
João Valverde [Fri, 19 Feb 2016 16:57:39 +0000 (16:57 +0000)]
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>
3 years agoQt: Fix Open protocol preferences button.
Stig Bjørlykke [Fri, 19 Feb 2016 18:25:36 +0000 (19:25 +0100)]
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>
3 years agorsl: avoid buffer overread
Peter Wu [Fri, 19 Feb 2016 17:36:38 +0000 (18:36 +0100)]
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>
3 years agoAdd inet_pton/inet_ntop interface to libwsutil
João Valverde [Wed, 10 Feb 2016 09:11:12 +0000 (09:11 +0000)]
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>
3 years agoBER/PER: Add dissector assertions to squelch scan-build bugs
João Valverde [Mon, 14 Dec 2015 06:42:41 +0000 (06:42 +0000)]
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>
3 years agoDLM3: Add support for the Need Slots Recovery Command Status Flag
Andreas Gruenbacher [Tue, 16 Feb 2016 23:27:36 +0000 (00:27 +0100)]
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>
3 years agoQt: Update AccordionFrame widgets to use common layout
Stig Bjørlykke [Thu, 18 Feb 2016 19:48:23 +0000 (20:48 +0100)]
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>
3 years agoDon't call the hci_usb dissector through a dissector table.
Guy Harris [Fri, 19 Feb 2016 05:01:24 +0000 (21:01 -0800)]
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>
3 years agossl: fix decryption when session ticket is not used
Peter Wu [Thu, 18 Feb 2016 17:24:29 +0000 (18:24 +0100)]
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>
3 years agoPrevent inproper use of negative value
Jaap Keuter [Tue, 16 Feb 2016 23:08:07 +0000 (00:08 +0100)]
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>
3 years agodcerpc: fix Called function pointer is null (null dereference) found by Clang Analyzer
Alexis La Goutte [Tue, 16 Feb 2016 20:37:38 +0000 (21:37 +0100)]
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>
3 years agoAdded support for Payload IE Vendor OUI.
Chris Brandson [Tue, 16 Feb 2016 17:40:12 +0000 (09:40 -0800)]
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>
3 years agoDon't bother setting phdr->pkt_encap to wth->file_encap.
Guy Harris [Fri, 19 Feb 2016 02:33:53 +0000 (18:33 -0800)]
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>
3 years agoPPP: remove obsolete Van Jacobson decompression preference
Pascal Quantin [Thu, 18 Feb 2016 16:11:59 +0000 (17:11 +0100)]
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>
3 years agoHave ETT variable names all begin with ett_.
Guy Harris [Thu, 18 Feb 2016 22:54:16 +0000 (14:54 -0800)]
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>
3 years ago802.15.4 fixed processing of PAN ID compression bit
Chris Brandson [Wed, 17 Feb 2016 19:23:16 +0000 (11:23 -0800)]
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>
3 years agoRemove some {-I,/I} flags.
Guy Harris [Thu, 18 Feb 2016 13:40:38 +0000 (05:40 -0800)]
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>
3 years agoAnother include that needs fixing.
Guy Harris [Thu, 18 Feb 2016 13:13:14 +0000 (05:13 -0800)]
Another include that needs fixing.

Change-Id: If06ba1bd887e0e47d74c9b75cbabedcfd7b84130
Reviewed-on: https://code.wireshark.org/review/13991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDon't add the wiretap directory to the list of include directories.
Guy Harris [Thu, 18 Feb 2016 12:06:13 +0000 (04:06 -0800)]
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>
3 years agoEIGRP: Add missing CD (Candidate Default) flag on Legacy Metric
Alexis La Goutte [Thu, 18 Feb 2016 07:05:55 +0000 (08:05 +0100)]
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>
3 years agoQt: Add regex support in Find Packet
Stig Bjørlykke [Tue, 16 Feb 2016 21:34:12 +0000 (22:34 +0100)]
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>
3 years agoGTPv2 command messages conversation
glores [Wed, 17 Feb 2016 08:04:01 +0000 (09:04 +0100)]
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>
3 years agoFix compilation of extcap programs with NMake
Pascal Quantin [Wed, 17 Feb 2016 22:18:55 +0000 (23:18 +0100)]
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>
3 years agocip: fix a leak
Dario Lombardo [Tue, 16 Feb 2016 13:19:42 +0000 (14:19 +0100)]
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>
3 years agousb: cleanup idProduct dissection
Christian Lamparter [Tue, 16 Feb 2016 19:12:00 +0000 (20:12 +0100)]
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>
3 years agoQt: Validate FindLineEdit regexp
Stig Bjørlykke [Tue, 16 Feb 2016 08:33:27 +0000 (09:33 +0100)]
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>
3 years agoautotools: Remove extra space from output
João Valverde [Wed, 17 Feb 2016 04:32:00 +0000 (04:32 +0000)]
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>
3 years agoCast away a warning.
Guy Harris [Tue, 16 Feb 2016 22:25:58 +0000 (14:25 -0800)]
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>
3 years agoiso14443: fix the NAK/ACK bit of an R-block
Martin Kaiser [Tue, 16 Feb 2016 16:12:26 +0000 (17:12 +0100)]
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>
3 years agoQt: Add Decode as in Show Packet Bytes
Stig Bjørlykke [Sun, 14 Feb 2016 22:01:09 +0000 (23:01 +0100)]
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>
3 years agoAdd packet-usbip.h to epan/dissectors/Makefile.common file
Pascal Quantin [Tue, 16 Feb 2016 19:25:16 +0000 (20:25 +0100)]
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>
3 years agoUSBIP: add USBIP Protocol dissector
Christian Lamparter [Sun, 31 Jan 2016 02:07:45 +0000 (03:07 +0100)]
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>
3 years agoUpdate Debian symbols.
AndersBroman [Tue, 16 Feb 2016 11:50:16 +0000 (12:50 +0100)]
Update Debian symbols.

Change-Id: I7ca826d247ea7e073ce9454a22b053d90ea8b2fa
Reviewed-on: https://code.wireshark.org/review/13966
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agows80211: Replace some whitespaces with tabs
Mikael Kanstrup [Mon, 15 Feb 2016 10:24:00 +0000 (11:24 +0100)]
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>
3 years agoRTPS: Added new locator kinds and upgraded to latest set of ids
Juanjo Martin [Fri, 12 Feb 2016 17:41:38 +0000 (18:41 +0100)]
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>
3 years agoIRDP: Use integer arithmetic to round-up [-Wbad-function-cast]
João Valverde [Fri, 12 Feb 2016 06:15:33 +0000 (06:15 +0000)]
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>
3 years agoCIP/ENIP: Attribute updates
D. Ulis [Thu, 11 Feb 2016 04:15:11 +0000 (23:15 -0500)]
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>
3 years agoconst gpointer -> gconstpointer
João Valverde [Tue, 5 Jan 2016 12:06:36 +0000 (12:06 +0000)]
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>
3 years agoiso14443: fix the order of the ATS bytes
Martin Kaiser [Mon, 15 Feb 2016 20:51:16 +0000 (21:51 +0100)]
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>
3 years agoiso14443: dissect FWI in the ATS
Martin Kaiser [Mon, 15 Feb 2016 20:35:46 +0000 (21:35 +0100)]
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>
3 years agoiso14443: move ATS dissection to a separate function
Martin Kaiser [Mon, 15 Feb 2016 20:29:45 +0000 (21:29 +0100)]
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>