Commit Graph

67957 Commits

Author SHA1 Message Date
Michael Mann c2ebb62e7e Don't use uint_to_str_back when you need guint32_to_str_buf.
It will end up eventually crashing column buffers because memory
behind the address is trounced.

Change-Id: Id6b5a42effc503e4b8bf5e1deb2135241e2893f3
Reviewed-on: https://code.wireshark.org/review/22563
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-09 19:54:35 +00:00
Simon Graham ffb8bbd372 Add support for dissecting UDT over DTLS
Includes adding per-conversation data to store whether we are over
DTLS or UDP and registering as a heuristic sub-dissector for DTLS.
Future changes will add more use of the conversation structure.

Also included is a capture of UDT over DTLS in test/captures/udt-dtls.pcapng.gz,
the associated private key for the session in test/keys/udt-dtls.key and a
new test in the decryption suite to check this works.

Change-Id: I76826d3b35768d0b58f5335063884616968e5784
Reviewed-on: https://code.wireshark.org/review/22533
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>
2017-07-09 18:25:08 +00:00
John Keeping 723c76b12c ZigBee: fix ZCL configure reporting response parsing
If configure reporting succeeds for all attributes, then the response
contains only a success status byte but if any attribute fails, then
every record contains a direction byte and attribute identifier.

By handling the "all successful" case specially, add an expert info
message to indicate a problem if the message length indicates that we
have hit this special case but the status is not "success".

Change-Id: I3facae8ac07f1a249cc6ae1b2454f8381151355b
Reviewed-on: https://code.wireshark.org/review/22557
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>
2017-07-09 18:10:25 +00:00
Stefan Metzmacher dd0dff78b3 packet-dcerpc: move auth information into a subtree
Change-Id: I0e5d3967a26b79c899b0d219317e2963969cba6b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17809
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>
2017-07-09 17:53:23 +00:00
Alexis La Goutte e23015e74d TLS13: Add draft 21 support
Release July 03, 2017

Bug: 12779
Change-Id: I527e83ccff6901688030dbcaf639878513a2ace2
Reviewed-on: https://code.wireshark.org/review/22564
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-09 17:52:28 +00:00
Alexis La Goutte 8869abfcb8 TLS13: Add Ticket nonce
Add Ticket nonce added on Draft 21

Bug: 12779
Change-Id: I2891e1ffe700d85f703b29feacccdc6dd7ff376d
Reviewed-on: https://code.wireshark.org/review/22565
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>
2017-07-09 17:51:31 +00:00
Alexis La Goutte 91a49173ee tfs: Add up down
Change-Id: Ifb7354bbbc639b4191f611c7840094f16e1f6819
Reviewed-on: https://code.wireshark.org/review/22566
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>
2017-07-09 17:50:35 +00:00
Stefan Metzmacher faf33d0d14 packet-dcerpc: improve the dissection of DCERPC Fault pdus
Change-Id: I70786cc561d248529167445e12190159d818ebcb
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17811
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>
2017-07-09 12:05:30 +00:00
Jonathan Munoz a3b47316eb 6LoWPAN: added dissection for 6LoRH. (RFC8138, RFC8025)
Change-Id: I13396077ec7f3ec4fe9cfea9b3bd03305a5ee332
Reviewed-on: https://code.wireshark.org/review/22484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-08 21:41:02 +00:00
Alexis La Goutte 474f344df7 QUIC: fix comment (use /* */ like other)
Change-Id: I874e2ab296d4b95146205ca30372ac1327817371
Reviewed-on: https://code.wireshark.org/review/22555
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-08 20:04:04 +00:00
Alexis La Goutte 355256a9ed QUIC: fix indent
Change-Id: I24d2586252d1bed5a02808e9ef0ba508e6a23ad8
Reviewed-on: https://code.wireshark.org/review/22554
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-08 20:03:46 +00:00
Peter Wu f7fef949e7 ieee80211: disable wireless timeline by default
As the wireless timeline is not fully finished and undocumented, disable
this GUI feature for now. This should avoid some user confusion when
opening an 802.11 trace.

For experimental and development purposes, the feature can be enabled
via the preferences (right-click on the "802.11 radio information"
layer, Protocol Preferences, Enable Wireless Timeline (experimental)").

Change-Id: Ieb529ccc0f23a051bcaba21ad18ac3c1d63b850e
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/22558
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-07-08 17:05:29 +00:00
Alexis La Goutte c4c4c44a21 BGP: fix incorrect decoding COMMUNITIES whose length is larger than 255
Issue reported by Kura

Bug: 13872
Change-Id: I054839a9e141fa4a882114b150842366c090d012
Reviewed-on: https://code.wireshark.org/review/22537
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>
2017-07-08 00:08:22 +00:00
Alexis La Goutte 9c29f73872 (G)QUIC: Add Heuristic to detect Google QUIC flow
Only support Q02x and Q03x version
and need to have the CHLO (Client Hello) to detect

Ping-Bug: 13529
Change-Id: I1ca7faa503aea2be4d39cb345070d901be0ebbaa
Reviewed-on: https://code.wireshark.org/review/22461
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>
2017-07-08 00:05:28 +00:00
Peter Wu bdd0965820 Qt: replace zoom buttons by wheel zoom in Wireless Timeline
There are already "zoom" buttons on the main toolbar, remove the
additional, confusing wireless timeline zoom buttons.

Implement zoom functionality by the mouse wheel instead and center at
the cursor position rather than the current packet. Properly bound the
maximum zoom level too to avoid incorrect calculations.

Change-Id: Icafe84b6985138b0223abb69c975dfc94df2817a
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/22496
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-07 23:19:59 +00:00
Mikael Kanstrup 9830b7b261 androiddump: Reduce code duplication
Some more repeated code patterns identified. Reduce code duplication
by adding some helper functions.

Change-Id: I0fecd511fd56049e9eae111cdad08252dffff6cb
Reviewed-on: https://code.wireshark.org/review/22480
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-07 23:17:58 +00:00
Stig Bjørlykke 7bacf534d8 Qt: Set tooltip on ByteViewTab
Set the tab name as tooltip on ByteViewTab.  This is useful when
having many tabs on a small screen.

Change-Id: Idb375f0b7d510ecb9b42cfccc6ebc4dd798f463b
Reviewed-on: https://code.wireshark.org/review/22549
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-07 23:16:30 +00:00
Darien Spencer a7a66a1890 UMTS FP: Set missing sub-frame
HS-DSCH T2 dissection method did not set the
'subnum' field in the packet info which broke
dissection in higher layers.

Change-Id: Ib50e9d783b4abfed477479b7fbaa46d005431322
Reviewed-on: https://code.wireshark.org/review/22540
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>
2017-07-07 17:23:03 +00:00
Pascal Quantin 993542685b GSM A GM: add APN rate control parameters elements in the right tree
Change-Id: Id0f4d84c9f0cf9c1e0ebfb45265a63e918f831e1
Reviewed-on: https://code.wireshark.org/review/22546
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-07 17:04:40 +00:00
Pascal Quantin 9d909b22fc GSM A GM: fix dissection of AER bit
Change-Id: I705e0ed70bbd9c540615f6bf6e603596deb11d0d
Reviewed-on: https://code.wireshark.org/review/22543
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-07 16:37:58 +00:00
Alexis La Goutte 635d9906af Fbzero: fix indent
Change-Id: Iae157730303f13e8b2abe73306e88bb070c78256
Reviewed-on: https://code.wireshark.org/review/22536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-07 12:04:16 +00:00
Alexis La Goutte e411dde969 Fbzero: use captured_length for avoid exception when executing the heuristic check
Change-Id: I9c51032060b821f79ba2fbbc496d6ce1e20ce304
Reviewed-on: https://code.wireshark.org/review/22535
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>
2017-07-07 12:03:45 +00:00
D. Ulis 564519e57a Ensure expert info fields have a summary.
It's not a requirement, but some dissectors didn't provide a static
summary because expert "format" was used.

While at it, fix a misleading expert info description, rename expert
info variables to ei_...  and remove an unused hf entry.

Change-Id: Ib81a0d0a3950b3c90954d0053b8dae49dbb0cd51
Reviewed-on: https://code.wireshark.org/review/20567
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-06 13:33:46 +00:00
Roland Knall a2fe8be603 Qt: Add convenience function and cleanup
Add a convenience function for the displayfilter combobox
and clean up some code. On Linux, the AltModifier does not work
as it is being used by xDMs to move the window around. Setting
it to Shift.

Change-Id: I1ee9638c1cf37f40dc21f19c4e0860adc4629d4e
Reviewed-on: https://code.wireshark.org/review/22529
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-06 13:21:10 +00:00
Pascal Quantin a70df2ce4c NBAP: please checkAPIs.pl script
Replace (legitimate) g_warning by ws_g_warning

Change-Id: Ib8a39070b06672342ea5ea42c147c56105252f89
Reviewed-on: https://code.wireshark.org/review/22534
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: Anders Broman <a.broman58@gmail.com>
2017-07-06 10:41:08 +00:00
Alexis La Goutte 05b028abde travis: fix build with osx (macOS)
Like say on -dev mailing https://www.wireshark.org/lists/wireshark-dev/201706/msg00113.html
and also recommanded when install Qt via homebrew (brew install qt)

[...]
If you need to have this software first in your PATH instead consider running:

  echo 'export PATH="/usr/local/opt/qt/bin:$PATH"' >> ~/.bash_profile

Fix following cmake error :

- Found python module asn2wrs: /Users/travis/build/alagoutte/wireshark/tools/asn2wrs.py

CMake Error at /usr/local/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:15 (message):

  The imported target "Qt5::Core" references the file

     "/usr/local/.//mkspecs/macx-clang"

  but this file does not exist.  Possible reasons include:

  * The file was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and contained

     "/usr/local/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"

  but not all the files it references.

Change-Id: I47137109c6ddb30de653e424d9baef4a340faad3
Reviewed-on: https://code.wireshark.org/review/22512
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-05 19:14:44 +00:00
Alexis La Goutte b1c993df0f xtea[.ch] (wsutil): Add Modelines info
Change-Id: I32823df7a6ad543fd7912f64169050534b6ff3a4
Reviewed-on: https://code.wireshark.org/review/22532
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-05 18:06:40 +00:00
Anders c5f296562f iface_lists: do not drop named pipes from interfaces list
(Named) pipes like "/tmp/fifo" or "-" have if_type == IF_WIRED instead
of IF_PIPE. Always try to add such interfaces such that "wireshark -i
/tmp/fifo" shows a "/tmp/fifo" item in the interfaces list.

Note that if an interface is really gone (like a disconnected USB
Ethernet device), then this could result in stale items in the list.

Ping-Bug: 13865
Fixes: v2.3.0rc0-2812-g40a5fb567a ("Restore interface selection after interface refresh")
Change-Id: Id05c65df332490a5bb789e4d6ca6404358edc3ec
Reviewed-on: https://code.wireshark.org/review/22407
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-05 12:59:12 +00:00
Pascal Quantin 9ff673d3e8 UMTS RLC: check rlc_channel_assign return value when searching duplicates
Bug: 13871
Change-Id: Id28d73115b557af96c23154a18dcee502b4305ed
Reviewed-on: https://code.wireshark.org/review/22520
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-05 09:34:04 +00:00
Pascal Quantin 02f66afd64 UMTS FP: do not try to compute CRC on payload when no payload is present
A call to tvb_memdup() with a 0 length triggers a UBSan warning

Change-Id: I6c99ef85050cd2219d2135f64f747961a8be6927
Ping-Bug: 13871
Reviewed-on: https://code.wireshark.org/review/22521
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>
2017-07-05 09:31:21 +00:00
Pascal Quantin a45ed8a222 RLC LTE: fix dissection of NB-IoT PDUs
While we are at it, let's cache the dissector handles

Change-Id: Ied301f0e9dc42da38976ba606df008b1e7e45102
Reviewed-on: https://code.wireshark.org/review/22518
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>
2017-07-04 20:48:28 +00:00
Pascal Quantin 365c831247 LTE RRC: upgrade dissector to v13.6.1
Change-Id: Ie436c03f5f1b471a4e814e8789eac892fcf7d444
Reviewed-on: https://code.wireshark.org/review/22517
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>
2017-07-04 20:38:02 +00:00
Alexis La Goutte 3bd9f8c6aa .mailmap: update (of June)
Change-Id: Ibd558c7030cb39e7978a05b5ba633303ed0ea046
Reviewed-on: https://code.wireshark.org/review/22033
Reviewed-by: Jeroen Sack <jsack@lely.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-04 18:02:13 +00:00
Piotr Tulpan bb470c9067 NBAP: improve conversation management
Keeps the address of the newly opened channels in the CTCH-SetupRqst message
to match them with the addresses sent in the Respone message to get exatch
match of the conversation.

Change-Id: I445e08480ddd178f65979b9fbc91c6031e206a61
Reviewed-on: https://code.wireshark.org/review/22271
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>
2017-07-04 17:06:12 +00:00
Roland Knall 367effa93c CMake: Fix eclipse indexer
The indexer for eclipse gets confused, because CMake automatically
adds __cplusplus=199711L which will lead to C-only files being parsed
wrong, if a __cplusplus guard is being used.

This has not interference with the code generation, just the __cplusplus
definition is omitted

Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe
Reviewed-on: https://code.wireshark.org/review/22506
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 15:15:49 +00:00
Roland Knall 0612af8deb UI: Fix preference utils store helper
Fix https://code.wireshark.org/review/19578 changed the behaviour when
saving a preference variable, effectively removing the capability
to store the value.

Change-Id: I6ad6b27e1779b73b58e8a76b37c9b613ff178d30
Reviewed-on: https://code.wireshark.org/review/22508
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-04 15:13:59 +00:00
Simon Graham c5e1e61fb0 Updates to UDT dissector formatting.
Includes
. Better/consistent formatting of summary in COL_INFO and details
. Fixes to properly identify protocol messages
. Decoding NAK message in summary

Change-Id: I082b83c6e0e970b2b27c84c7990abae67c658cdf
Reviewed-on: https://code.wireshark.org/review/22495
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>
2017-07-04 03:41:00 +00:00
Peter Wu b8af91af64 Qt: try harder to sort packet list columns as number
Properly sort columns by their numeric value even if they have a unit
string suffix or if there are multiple occurrences. These do not
strictly parse as a number, so use a more lenient matching approach.

Bug: 13827
Change-Id: I3a777448a98c70fdc05fb847b05f20e2bc6f4486
Reviewed-on: https://code.wireshark.org/review/22489
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-04 03:31:11 +00:00
Stig Bjørlykke 478c496d2f l2cap: Show initial credits in Info column
Change-Id: I61bc005ed6f9efc31f5756452a10bbcb97a68b66
Reviewed-on: https://code.wireshark.org/review/22504
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-04 03:30:09 +00:00
Stig Bjørlykke 7897f04fde btle: Add item for the generated l2cap index
Also detect "Missing Fragment Start" packet.

Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c
Reviewed-on: https://code.wireshark.org/review/22498
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-04 03:29:27 +00:00
Darien Spencer b6571a0701 [UMTS RLC] Allow multiple payloads in INFO column
Currently the code sets 'writable' to false for the '-1' column (all columns?) after the first successfuly decoded RRC payload.
So only the first of all RRC payloads in a single RLC will be shown. This change allows all of them to show using fences.

Change-Id: I203f0c520d331dbb142eb5bdd8339f89c5124394
Reviewed-on: https://code.wireshark.org/review/22493
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-03 23:23:19 +00:00
João Valverde caa06ddeab Replace and remove enterprises_lookup_format()
Change-Id: I27517bdfc4d00ee758d3795bd74e54968e70efad
Reviewed-on: https://code.wireshark.org/review/22497
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-03 20:07:37 +00:00
Yasuyuki Tanaka 1aa8ded9a3 ieee802154: support 6top protocol (6P) draft-07
- support draft-ietf-6tisch-6top-protocol-07
- replace proto_tree_add_subtree_format() to make manageable JSON output
- use constant values defined for the 1st F-Interop 6TiSCH Interop Event

Bug: 13868
Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082
Reviewed-on: https://code.wireshark.org/review/22500
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-03 20:06:04 +00:00
Alexis La Goutte b6f36e95fa mate_grammar(lemon): fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7
Change-Id: Id26c1c0d1678613a90ff7707265ec062cd30cf83
Reviewed-on: https://code.wireshark.org/review/22501
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>
2017-07-03 19:58:11 +00:00
Sake Blok 3803e00367 Add option to use wall-clock intervals
Add the "interval" option to "-b". Each new capture starts at the
exact start of a time interval. For instance, using -b interval:3600
will start a new capture file at each whole hour.

Changed the duration option in the GUI interfaces to use the new
interval option.

Change-Id: I0180c43843f5d2f0c2f50153c9ce42ac7fa5aeae
Reviewed-on: https://code.wireshark.org/review/22428
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
2017-07-03 16:41:37 +00:00
Yasuyuki Tanaka 2c58ed569e ieee802154: fix a bug preventing Payload Terminate IE dissection
Bug: 13867
Change-Id: Ib251b8646ddf428f0aa053dd91b613c027145d20
Reviewed-on: https://code.wireshark.org/review/22499
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>
2017-07-03 12:52:56 +00:00
Kenneth Soerensen faed12e6ff ZigBee: Add attribute and command names from Price used with GBCS
The Great Britain Companion Specification specifies how energy meters
will communicate in the UK. This patch adds names for attributes and
commands from the Smart Energy Price cluster that are used within
that specification.

Change-Id: Ibbbf2ac52f61887004f03bbb1aa7f4d57b63268e
Reviewed-on: https://code.wireshark.org/review/22473
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-01 23:55:50 +00:00
Peter Wu e47b68b578 ospf: workaround Opaque Information with bad TLV
The linked pcap seems to contain a TLV (type=255 (Unknown)) followed by
four bytes (00 00 00 14, interpreted as TLV (type=0, length=20)). That
is bogus, so stop dissecting if no more data is available.

While at it, implement alignment at four octets.

Bug: 13823
Change-Id: Iacf863c0c6605db40e87f63a950d61c1db6debaa
Reviewed-on: https://code.wireshark.org/review/22488
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>
2017-07-01 06:37:22 +00:00
Mikael Kanstrup f9fd438b6d androiddump: Close socket on failure path
Fix a few cases where socket is not closed on failure path.

Change-Id: Id116a8e5f14979f962fdf725c62999758b79109e
Reviewed-on: https://code.wireshark.org/review/22481
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-01 01:24:44 +00:00
Mikael Kanstrup 91e512985f androiddump: Fix null dereference if linktype not found
If linktype cannot be determined from tcpdump output the
lookup function is handed a NULL which is then strcmp:ed.
Handle NULL parameter by explicit check.

Fixes Coverity CID 1413923

Change-Id: I290c116991d15cef0a1e954a9f8b76722a5f450c
Reviewed-on: https://code.wireshark.org/review/22483
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-01 01:24:31 +00:00