Commit Graph

71064 Commits

Author SHA1 Message Date
Tadeusz Struk fbf1409719 README.dissector: update info about tvb_get_nstringz
Update invalid description for tvb_get_nstringz() and
tvb_get_nstringz0().

Change-Id: I03483bc1a2aa5a701b44cd895b91289716ef215d
Reviewed-on: https://code.wireshark.org/review/26598
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25 18:59:02 +00:00
Martin Mathieson a00bb067d7 protobuf: allow config of UDP ports
Make it easier to check if traffic over UDP ports is
protobuf-based.

Change-Id: Ib88c4a7a6d2996f53249da6707f35e06b38c7b2d
Reviewed-on: https://code.wireshark.org/review/26625
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25 18:57:18 +00:00
Martin Kaiser 03e01a42b7 ieee80211: use 64bit value string for a 64bit hf variable
Using a 32bit value string triggers the assertion in
hf_try_val64_to_str().

Bug: 14560
Change-Id: Ief3f46ee60355f43d2fb5f210608fde21be8d41d
Reviewed-on: https://code.wireshark.org/review/26633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25 17:53:19 +00:00
Allan Møller Madsen 3f54f88fba Bluetooth HCI evt: dissect last remaining BT5 events
Add dissection of events:
LE Periodic Advertising Sync Established
LE Periodic Advertising Report
LE Periodic Advertising Sync Lost
LE Advertising Set Terminated
LE Scan Request Received
LE Channel Selection Algorithm
SAM Status Change

Add missing extended LMP feature bits

Change-Id: I6aed69ff70674950507a7f4730f4136077c00357
Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
Reviewed-on: https://code.wireshark.org/review/26631
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25 17:35:11 +00:00
Gerald Combs fddc96073a [Automatic update for 2018-03-25]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084
Reviewed-on: https://code.wireshark.org/review/26635
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-25 16:06:09 +00:00
Uli Heilmeier ab12d98da8 RPCRDMA: Fix 'might be clobbered' warning
Fix "might be clobbered by 'longjmp' or 'vfork' warning

Change-Id: I3c7433568c452782316e37efd9697effdf0ebe0f
Reviewed-on: https://code.wireshark.org/review/26632
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-03-25 12:56:06 +00:00
Michał Łabędzki 1babdb9709 Update my email
Old e-mail does not exist right now, but I am still here.

Change-Id: I8436bf340e2f4a1948674a686fea32dee0fe91f6
Reviewed-on: https://code.wireshark.org/review/26627
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-25 09:53:26 +00:00
Michał Łabędzki a344e8fc92 Bluetooth: ATT: Appearance: Add new items
Items:
  Personal Mobility Device
  Continuous Glucose Monitor
  Insulin Pump
  Medication Delivery

Change-Id: If0e706506164883b34550a6c6865095c4dd1e816
Reviewed-on: https://code.wireshark.org/review/26626
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-25 09:52:09 +00:00
Guy Harris b577bff1ae In some dialogs, have *no* auto-default buttons on macOS.
In macOS dialogs, there's a default button, which is the button that
Enter/Return activates, and that Enter/Return *always* activates,
*regardless* of what button has the input focus.  To activate the button
that has the input focus, you use the space bar.

To implement that, we need to disable auto-default on all buttons,
including the Cancel button.

Put in a comment explaining all this.

We may want to do this in all alert boxes, and possibly all dialogs with
buttons.

Change-Id: I214dd2870a9720ea705d8db39adc5b6af2003fb1
Reviewed-on: https://code.wireshark.org/review/26629
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25 02:15:50 +00:00
Pascal Quantin 14fbbc8335 RPC-over-RDMA: add explicit fall through comments to please gcc 7.2.0
Change-Id: Ied55b2283da36dabd21768660f6824492cd569a1
Reviewed-on: https://code.wireshark.org/review/26624
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-24 10:45:20 +00:00
Peter Wu 4847076c7f wslua: Fix logging
Always display Lua messages (to match tshark), do not send them to
qDebug as they will not be visible with the default log options.

Change-Id: I660a3877355891d45881b26735596ea6dc8a8b29
Fixes: v2.5.0rc0-2037-gc9b6887d84 ("wslua: Fix logger after g6a5e90f2")
Reviewed-on: https://code.wireshark.org/review/26599
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24 07:17:03 +00:00
Jorge Mora 8f0f691312 RPC-over-RDMA: add reassembly for reply, read and write chunks
The RDMA reply chunk is used for a large RPC reply which does not fit
into a single SEND operation and does not have a single large opaque,
e.g., NFS READDIR. The RPC call packet is used only to set up the RDMA
reply chunk. The whole RPC reply is transferred via RDMA writes.
Fragments are added on any RDMA write packet, RDMA_WRITE_ONLY,
RDMA_WRITE_FIRST, etc., and the reassembly is done on the reply
message. The RPC reply packet has no data (RDMA_NOMSG) but
fragments are reassembled and the whole RPC reply is dissected.

The RDMA read chunk list is used for a large RPC call which has
at least one large opaque, e.g., NFS WRITE. The RPC call packet
is used only to set up the RDMA read chunk list. It also has the
reduced message data which includes the first fragment (XDR data
up to and including the opaque length), but it could also have
fragments between each read chunk and the last fragment after
the last read chunk data. The reduced message is then broken
down into fragments and inserted into the reassembly table.
Since the RDMA read chunk list is set up in the RPC call
then do not dissect the upper layer in this case and just
label rest of packet as "Data" since the reassembly will
be done on the last read response.

The protocol gives the XDR position where each chunk must be
inserted into the XDR stream thus as long as the maximum
I/O size is known it is possible to know exactly where to
insert these fragments. This maximum I/O size is set on the
first READ_RESPONSE_FIRST or READ_RESPONSE_MIDDLE but in case
where any of these packets have not been seen then a value
of 100 is used (real value should be at least 1024) but in
this case the message numbers are not consecutive between
chunks but since the total size of all chunks is verified to
make sure there is a complete message to reassemble then all
fragments should be in the correct order.

Fragments are added on any RDMA read packet: RDMA_READ_RESPONSE_ONLY,
RDMA_READ_RESPONSE_FIRST, etc., and the reassembly is done on the
last read response. Since there could be multiple chunks and each
chunk could have multiple segments then the total size must be
checked to complete the reassembly because in this case there
will be multiple READ_RESPONSE_LAST.

The RDMA write chunk list is used for a large RPC reply which has
at least one large opaque, e.g., NFS READ. The RPC call packet is
used only to set up the RDMA write chunk list. The opaque data is
then transferred via RDMA writes and then the RPC reply packet is
sent from the server.

The RPC reply packet has the reduced message data which includes
the first fragment (XDR data up to and including the opaque length),
but it could also have fragments between each write chunk and the
last fragment after the last write chunk data. The reduced message
is then broken down into fragments and inserted into the reassembly
table. Since the RPC reply is sent after all the RDMA writes then
the fragments from these writes must be inserted in the correct
order: the first RDMA write fragment is inserted with message
number 1, since the first fragment (message number 0) will come
from the very last packet (the RPC reply with RDMA_MSG). Also,
the last packet could have fragments which must be inserted in
between chunk data, therefore message numbers from one chunk to
another are not consecutive.

In contrast with the RDMA read chunk list, the protocol does not
allow an XDR position in the RDMA write chunks, since the RPC
client knows exactly where to insert the chunk's data because
of the virtual address of the DDP (direct data placement) item.
There is no way to map a virtual address with an XDR position,
thus in order to reassemble the XDR stream a two pass approach
is used. In the first pass (visited = 0), all RDMA writes are
inserted as fragments leaving a gap in between each chunk.
Then the dissector for the upper layer is called with a flag
letting the dissector know that it is dealing with a reduced
message so all DDP enabled operations handle the opaque data
as having only the size of the opaque but not the data and
reporting back the offset from the end of the message.
Once the upper layer dissector returns, this layer now has a
list of DDP eligible item's offsets which are then translated
into XDR offsets and then the RPC reply packet is broken into
fragments and inserted in the right places as in the case for
the RDMA read chunk list. On the second pass (visited = 1),
all fragments have already been inserted into the reassembly
table so it just needs to reassembled the whole message and
then call the upper layer dissector.

RFC 8267 specifies the upper layer bindings to RPC-over-RDMA
version 1 for NFS. Since RPC-over-RDMA version 1 specifies the
XDR position for the read chunks then only the write chunk DDP
eligible items are handled in the upper layer, in this case the
NFS layer. These are the only procedures or operations eligible
for write chunks:
* The opaque data result in the NFS READ procedure or operation
* The pathname or linkdata result in the NFS READLINK procedure
  or operation

Two functions are defined to signal and report back the DDP
eligible item's offset to be used by the upper layers.
Function rpcrdma_is_reduced() is used to signal the upper layer
that it is dealing with a reduced data message and thus should
ignore DDP eligible item's opaque processing and just report
back the offset where the opaque data should be. This reporting
is done using the second function rpcrdma_insert_offset().

Reassembly is done for InfiniBand only. Reassemble fragments using
the packet sequence number (PSN) of each RDMA I/O fragment to make
sure the message is reassembled correctly when fragments are sent
out of order. Also a unique message id is used for each message so
fragments are reassembled correctly when fragments of different
messages are sent in parallel.

The reassembled message could be composed of multiple chunks
and each chunk in turn could be composed of multiple segments
in which each segment could be composed of multiple requests
and of course each request is composed of one or more fragments.
Thus in order to have all fragments for each segment belonging
to the same message, a list of segments is created and all
segments belonging to the same message are initialized with
the same message id. These segments are initialized and added
to the list on the call side on RDMA_MSG by calling
process_rdma_lists.

Bug: 13260
Change-Id: Icf57d7c46c3ba1de5d019265eb151a81d6019dfd
Reviewed-on: https://code.wireshark.org/review/24613
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24 07:09:59 +00:00
Robert Grange a6fcceb98e packet-mq: Fix for Encoding problem in some MQ Struct
Fix to use the MD encoding info when decoding some MQ Struct

Change-Id: I0de05efeff41df893b82ac36ad28cfa04c68b1e0
Reviewed-on: https://code.wireshark.org/review/26510
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24 07:08:47 +00:00
Jaap Keuter 2f34f26203 OID name resolv: Fix MIB/PIB path presentations
oids.c: Sort out libsmi init, add user paths once.
Qt, About WS: Stop memory leak of MIB/PIB paths.
GTK, About WS: Allow for 20 individual paths.
tshark, folders: init before getting paths, allow 20 individual.

Bug: 14539
Change-Id: I113ee2dd4394d553a16b256e66fd840eeeec78ef
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26555
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24 07:07:14 +00:00
Sergey Avseyev 98b46985dd Couchbase: update opcodes and decode AUDIT_PUT as JSON
Change-Id: I6b9e3455abbf0cbd4eb6513fc652cf2902c9eb79
Reviewed-on: https://code.wireshark.org/review/26570
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24 07:05:02 +00:00
Guy Harris 37490e3607 Update a comment.
Change-Id: I9a1f5ed85591202c52f26d4b3d63d8beb7578e15
Reviewed-on: https://code.wireshark.org/review/26623
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24 04:03:20 +00:00
Guy Harris b4b374937f Fix a comment.
We already *have* an exported dissector that always dissects PPP without
HDLC-like framing; the question is whether we should have one that
always dissects PPP with HDLC-like framing (with a check for the
HDLC-like framing, in case, for example, it was negotiated away), but
doesn't check for Cisco HDLC.

Change-Id: I3b3319dd29c7516220b82df626bc6ac520ea0dd9
Reviewed-on: https://code.wireshark.org/review/26622
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24 03:33:50 +00:00
Guy Harris 0f34a866bb Hand off to the PPC-in-HDLC-like-framing dissector.
There might be HDLC-like framing inside SSTP, even if it eventually gets
negotiated away.

Bug: 14559
Change-Id: Ibc254f221f26c0da905ceff4edff7859a3fec635
Reviewed-on: https://code.wireshark.org/review/26619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24 03:29:05 +00:00
Guy Harris bff1f7f70e Don't rely on "xxx *yyy[N] = {};" compiling.
At least as I read C90 "6.5.7 Initialization" and C99 "6.7.8
Initialization", there must be at least one "initializer" in an
"initializer-list", so nothing requires that the compiler accept, for
example

	static const ws_mem_usage_t *memory_components[MAX_COMPONENTS] = {
	};

Bug: 14556
Change-Id: Ief1dbfee504ad5ef1d984390dc2da18deba7fb90
Reviewed-on: https://code.wireshark.org/review/26616
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24 02:33:17 +00:00
Guy Harris d12a41b17a Include alloca.h if we have it.
Bug: 14552
Change-Id: I799691f7f33ca56748ed4e51d7d548f37769837b
Reviewed-on: https://code.wireshark.org/review/26611
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23 22:39:07 +00:00
Gerald Combs a7edc4f25f Qt: Remove a redundant include.
Change-Id: I0f5e4227bebc98678344b28e835e1c7b26b57502
Reviewed-on: https://code.wireshark.org/review/26607
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-23 19:59:27 +00:00
Peter Wu 0b49342156 Qt: ensure that taps are invoked on reload/rescan
Invoke the tap draw callback immediately after reloading a capture (or
changing a display filter) rather than waiting for a timer to expire.

Change-Id: I3d1549d1a18c8e173cd29d45f31ce7586e0d70fe
Reviewed-on: https://code.wireshark.org/review/26600
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23 19:41:39 +00:00
Peter Wu e804376612 docs: improve Lua Listener example
Ensure the dialog is populated when the dialog is opened after a capture
file has already been loaded.

Change-Id: I9ba1b4a1eb7a8b21ce7dac4a820eadf10daa9845
Reviewed-on: https://code.wireshark.org/review/26601
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23 19:41:21 +00:00
Joerg Mayer cf5f77aca2 packet-ieee80211.c: Fix runtime warning "field wlan.trigger.he.common_info is not of type FT_CHAR or an FT_{U}INTn type"
Change-Id: I4796abc440f386e4326067dff825486dedb9d07b
Reviewed-on: https://code.wireshark.org/review/26597
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-23 19:40:49 +00:00
Guy Harris a0f0b3789c Update a comment.
Change-Id: Id5fc4ca97212c5d4c91ff89806b9e6b826114b17
Reviewed-on: https://code.wireshark.org/review/26608
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23 18:53:40 +00:00
Guy Harris 8e42d810d1 Use $(INSTALL_DATA) rather than $(INSTALL) -m 644.
Change-Id: Ic9a867dad615f9d7ed8f8f22eb47ee24e57d5130
Ping-Bug: 14555
Reviewed-on: https://code.wireshark.org/review/26606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23 18:14:12 +00:00
Guy Harris 4f37a3e015 Add -Wp,-H200000 with HP's C compiler.
Bug: 14554
Change-Id: Ieef015daf852049744a5dd9d3d0dfd566f3ce8fc
Reviewed-on: https://code.wireshark.org/review/26603
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23 17:43:33 +00:00
Gerald Combs 9b83aaeccc Skip hidden columns when we export packets.
Skip hidden columns when we export to CSV, EK, and PSML.

Change-Id: Id1dc0f4d3cf34e74ce52893d0f0a30f4b4d61aed
Reviewed-on: https://code.wireshark.org/review/26588
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-23 00:06:07 +00:00
Martin Mathieson 380396e5e6 mac-nr: Minor changes
Minor display issues, and show in context tree 2
recently-introduced fields.

Change-Id: I14ecde0059d17abd17767d4d0c34ba093fa1987f
Reviewed-on: https://code.wireshark.org/review/26596
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22 22:27:08 +00:00
Guy Harris 1ea82e4ff7 Don't crash for ERSPAN packets in Linux cooked captures.
Sadly, "cooked" means the GRE header isn't available; the extra data
pointer is null, so we can't dereference it.

Bug: 14548
Change-Id: I51ae67dcc144b7f5ab3c82dd9adf09b342b29ced
Reviewed-on: https://code.wireshark.org/review/26595
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-22 21:16:40 +00:00
Nikhil AP c55d15783c Add Arista Vendor Specific Protocol (Ethertype) dissector
Bug: 14550
Change-Id: I08d54825eb054255167eb28469b7fb854507e4ed
Reviewed-on: https://code.wireshark.org/review/26492
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 20:15:12 +00:00
Pascal Quantin 2e02b438cc NR-RRC: remove a redundant declaration
Change-Id: Iddc49443ea4534314ef39bae749ddafb135143ff
Reviewed-on: https://code.wireshark.org/review/26591
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22 13:38:58 +00:00
Martin Mathieson 92a015a523 mac-nr: fix some wrongly named field names
Fix some wrongly named fields names related to
multiple entry PHRs.

Change-Id: I87b8b53ddfb86255d4840a73cdf4e570b7f9b9f0
Reviewed-on: https://code.wireshark.org/review/26590
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22 10:41:49 +00:00
Martin Mathieson f71645045f nr-mac: Add Multiple Entry PHR CE to nr-mac
This will likely change in the future as we:
- add support for 32-bits of flags for when there are
higher SCellIndex
- possibly add different filters for each type of ph measurement
- possibly add separate filters for the pcmax_c fields

Change-Id: Icb9b242910a41b1b9e448ae2cd1dbd54a418fd36
Reviewed-on: https://code.wireshark.org/review/26507
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22 09:23:50 +00:00
Pascal Quantin 997b63102d ZigBee ZCL Occupancy Sensing: remove unused defines and value_string
Change-Id: Ifa5209fb0c64034eb85356d1bc336487ff43a9c2
Reviewed-on: https://code.wireshark.org/review/26589
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22 08:48:34 +00:00
Gizem Yurdagul fd69d893ff PROFINET: Am_location dissection was wrong byte order.
Dissection is updated according to spec.

Unnecessary tab and spaces are removed.

Change-Id: Ia9b3252f5e9dcdc3617286a802fffeef250888c2
Reviewed-on: https://code.wireshark.org/review/26542
Reviewed-by: Birol Capa <birol.capa@siemens.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 07:02:21 +00:00
Paul Zander 79d6dc31ff Update and extend the ZigBee ZCL color control cluster.
Change-Id: Ife7c15797e2167acf248a09718fe2ad87ec638e7
Reviewed-on: https://code.wireshark.org/review/26552
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:21:52 +00:00
Paul Zander 782377327f Fix dissector bug in ZCL Occupancy Sensing Cluster.
Change-Id: I6b8e3639653f00d7d31c20cd3080d946eed5ec65
Reviewed-on: https://code.wireshark.org/review/26580
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:20:06 +00:00
Dario Lombardo 5077890e0a dns: fix indentation.
Change-Id: I25894fd4e28002f75e43b7a6fd7bec58889e0590
Reviewed-on: https://code.wireshark.org/review/26538
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:19:11 +00:00
Dario Lombardo a055e3c299 dns: skip stats if packet is within icmp.
Change-Id: I0f1866361ce60713535b1875fc9b75fe049f1790
Reviewed-on: https://code.wireshark.org/review/26537
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:18:43 +00:00
Dario Lombardo 6cff9f0720 dns: add filters for retransmitted and unsolicited packets.
Change-Id: I1af293a9dc53869858dafc5921792aa3fbbfe766
Reviewed-on: https://code.wireshark.org/review/26536
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:18:21 +00:00
Dario Lombardo 9a864b6e64 dns: add service-level stats.
They include:
- request-response time
- unsolicited response count
- retransmissions count

Change-Id: I01398bf1a88a23fb7850715f256b178c66d933a4
Reviewed-on: https://code.wireshark.org/review/26535
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:17:53 +00:00
Yasuyuki Tanaka 9be139cae0 ieee802154: support 6top protocol (6P) draft-10
- remove GEN field, that is obsoleted
- add SIGNAL command
- update return codes following the draft

Bug: 14542
Change-Id: I7eeb6f832d23688d5dc50f68224da9a7612429ff
Reviewed-on: https://code.wireshark.org/review/26553
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-22 06:17:09 +00:00
Peter Wu eea63ae2a7 TLS: allow cipher information to be retrieved
In preparation for QUIC packet decryption, add a method to retrieve the
cipher used in a TLS session. (QUIC embeds the TLS handshake.)

Change-Id: If58e16bd0a01808dafa455ddc6c67ad23f33d7da
Reviewed-on: https://code.wireshark.org/review/26558
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-21 18:12:43 +00:00
Peter Wu 184b943fbd QUIC: fully fix random access decryption, improve error messages
When a conversation contains two Initial Packet messages or payloads
spanning key updates, then the cipher might be unusable when trying to
decrypt an earlier packet. To solve this, perform decryption on the
first pass only and store the result (error message and plaintext).

Display an error message when payload decryption is not possible due to
missing keys (currently, TLS Exporter secrets from the TLS key log).

Refactor code for adding decrypted results/expert info to reduce code
duplication and have less ifdef's.

Bug: 13881
Change-Id: I932069b09840e14c7ccc6a235f62b8830f1b85aa
Reviewed-on: https://code.wireshark.org/review/26577
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21 16:57:31 +00:00
Peter Wu 746410f70f QUIC: fix decryption and PKN dissection with random access
Packet number (PKN) reconstruction must happen sequentially or the wrong
value can be derived. A wrong packet number will also result in
decryption value. Fix this by storing the full packet number per packet.

Always display the full PKN field for use in a column. Improve tracking
of the client and server side.

Bug: 13881
Change-Id: Ia386893e719411c21793aca509a6d07a06823e2e
Reviewed-on: https://code.wireshark.org/review/26574
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21 16:57:18 +00:00
Peter Wu 8ca1e35c9a QUIC: Add 1-RTT packet decryption (draft -09)
Use the exporter secrets as written by NSS or boringssl to derive packet
protection keys.

Test: tshark -r ngtcp2-09.pcap -ossl.keylog_file:ngtcp2-09.keys -V

Known issue: random access dissection of handshake and packet protection
data sometimes fails because packet number reconstruction requires a
sequential pass. This will be fixed later.

Bug: 13881
Change-Id: I58b2379d6bc2a6274b154b26054fa6cbbfa8e8fb
Reviewed-on: https://code.wireshark.org/review/26559
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21 16:56:56 +00:00
Peter Wu 0484f95963 TLS13: TLS-Exporter interface for QUIC decryption
Add support for "EXPORTER_SECRET" (NSS 3.34, boringssl 1c58471cc9f4) and
"EARLY_EXPORTER_SECRET" (NSS 3.35) key log lines. These secrets can be
used with the TLS-Exporter interface to derive QUIC 0-RTT/1-RTT keys.

Ping-Bug: 13881
Change-Id: I7ff3e51ce0bd868353aacb2e3a52b28f144af341
Reviewed-on: https://code.wireshark.org/review/24981
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21 16:56:46 +00:00
Peter Wu 7c0c8189a6 Qt: fix "Follow stream" in Conversations dialog
If no stream is given to FollowStreamDialog::follow(), then it
overwrites the display filter with a conversation filter for the first
packet in the capture file.

Pass an explicit stream number and the "Follow stream" button will set a
correct display filter.

Test: open pcap with three TCP streams. Statistics -> Conversations.
Select last TCP conversation (expect "tcp.stream eq 2"). Select the
second conversation (expect "tcp.stream eq 1") and activate "Filter Out"
button (expect "!(tcp.stream eq 1)" and not "!(tcp.stream eq 2) and
!(tcp.stream eq 1)").

Bug: 14254
Change-Id: I28744d7f76f5034b07ea5660b45399566e3a7d2c
Reviewed-on: https://code.wireshark.org/review/26520
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21 16:56:21 +00:00
Joakim Karlsson 83d028792a GPRSCDR: fix bitrates in EPCQoSInformation
Changed type for the bitrate fields, from signed32 to unsigned32.
This fixes the problem of getting "-1" values at G_MAXUINT32.

TS 32.298 refers to TS 29.212 regarding bitrates, in TS 29.212 the
corresponding AVPs are defined as Unsigned32.

Change-Id: I6e0083bf034c7254ab48ca3c2c405cc20f5d6394
Reviewed-on: https://code.wireshark.org/review/26585
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-21 10:44:54 +00:00