Commit Graph

36316 Commits

Author SHA1 Message Date
Guy Harris 3eb8784140 Use the Wayback Machine for a reference.
Change-Id: I4745cdf6ba863674525851e98c8a52422d4e65f0
Reviewed-on: https://code.wireshark.org/review/25628
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06 08:33:16 +00:00
Guy Harris ea7a5bd02c Use separate dissectors for LAPD and LAPD-with-Linux-SLL-header.
That obviates the need to check pinfo->pkt_encap.

Change-Id: I038e065932282ce9d3362fbc9ba6ea653a63f399
Reviewed-on: https://code.wireshark.org/review/25627
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06 08:16:24 +00:00
Gerald Combs 3ec8338497 BACapp: Fix a loop check.
Fix an offset check in a nested loop. Make our offset checks more
paranoid.

Bug: 14387
Change-Id: I2890b27731ec293a3cb08dcfdf7a18aef808ad31
Reviewed-on: https://code.wireshark.org/review/25622
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06 07:19:32 +00:00
Gerald Combs dcfc57486d IPMI: Add NULL pointer checks.
Check for a valid data->curr_frame in ipmi_set_data and ipmi_get_data.

Bug: 14393
Change-Id: I615975015da864718dbd486d875aa3020db94edd
Reviewed-on: https://code.wireshark.org/review/25621
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06 07:19:19 +00:00
Pascal Quantin 8ab3060aac Thrift: stop dissection when encountering an unknown/unexpected type
Let's add an expert info, and set offset to the end of the current tvb.

Bug: 14379
Change-Id: Iaccf862c451eef58aaed11b26fceebf26bc2c818
Reviewed-on: https://code.wireshark.org/review/25619
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06 05:36:05 +00:00
Robert Grange 746511d5ba packet-mq: Fix a wrong offset+Add value in val_str
fixed an offset error for mqmo in gmo
Added value in comment when defining val_str

Change-Id: Ie29f65f96d2ffb96c0cc0623346432f1f8380168
Reviewed-on: https://code.wireshark.org/review/25604
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-05 20:03:18 +00:00
Jim Walker 0420088e9f Update couchbase dissector with collections and delete_time DCP
Add support for collection commands
* SET/GET manifest
* DCP changes (mutation/deletion/system_event)

Add support for DCP delete_time, a new format for DCP deletion

Change-Id: Iec2000a40da37dcb1edf665a157dc7ab30d4c9d0
Reviewed-on: https://code.wireshark.org/review/25612
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-05 19:07:56 +00:00
Jim Walker 80150df416 Update couchbase dissector with new HELLO feature values
Simply add missing feature values to the existing table

Change-Id: Ie4b0876df1d736af1cd1171a6645df75e2eb8cf2
Reviewed-on: https://code.wireshark.org/review/25611
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-05 16:19:20 +00:00
Pascal Quantin d447467eb5 MQ: use real string length when calling strip_trailing_blanks()
Bug: 14390
Change-Id: I5acfc651237da55c3ee907f21d89a3add6edeeef
Reviewed-on: https://code.wireshark.org/review/25596
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-04 18:51:13 +00:00
Pascal Quantin 551f6bdd8c MQ: keep extended value string array sorted
Change-Id: If7d6c8d75179eca213a90977657c61e9a9677474
Reviewed-on: https://code.wireshark.org/review/25595
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-04 18:50:57 +00:00
Robert Grange 3aff560761 packet-mq: Fix problem in get_mq_pdu_len
Found during fuzz test that the get_mq_pdu_len can return
a 0 length pdu. Fix to at least return tvb_reported_length_remaining

Change-Id: I6410f71724a6288fe42a4f600e72a8af787aa7eb
Reviewed-on: https://code.wireshark.org/review/25574
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-02-04 11:30:14 +00:00
Guy Harris c2debddb2c Don't assume address data is aligned.
The data for an address is *not* guaranteed to be aligned on any
particular boundary, so, for IPv4 addresses, don't assume it's aligned
on a 32-bit boundary - to get it in host byte order, fetch it with
pntoh32(), which fetches a 32-bit value that's in network byte order,
and isn't necessarily aligned on any particular boundary, and returns it
in host byte order.

Change-Id: Ic512ab4b1e0f2815d9f0af0e33714f456a08a45d
Reviewed-on: https://code.wireshark.org/review/25589
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-04 04:11:00 +00:00
Stig Bjørlykke 3d574a4b2b mqtt: Put msgid and topic in Info column
Change-Id: If6e149f21a9c8bd122daa6d751f72b8d8c0454ff
Reviewed-on: https://code.wireshark.org/review/25578
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-03 22:01:42 +00:00
Guy Harris ebb471f211 Clean up addition of FT_IPv{4,6} fields.
The data for an address is *not* guaranteed to be aligned on any
particular boundary, so, for IPv4 addresses, don't assume it's aligned
on a 32-bit boundary - copy it with memcpy() and use the result of the
copy.

For IPv6 addresses, cast the data pointer to a pointer to a *const*
ws_in6_addr, so we don't throw away constness.

Change-Id: I0e00263f594d7778c3bd9b98e4336cb201c1f3d5
Reviewed-on: https://code.wireshark.org/review/25580
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-03 21:16:08 +00:00
Jakub Zawadzki 2fecc96868 dmp: fix memleaks
dmp_long_id_hash_table is wmem_map autoreset on file scope.
Don't put there g_strdup() data.

Valgrind log:
==15134== 8 bytes in 2 blocks are definitely lost in loss record 3,988 of 49,961
==15134==    at 0x4C29C4F: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==15134==    by 0xA94E405: g_malloc (gmem.c:97)
==15134==    by 0xA966C4E: g_strdup (gstrfuncs.c:356)
==15134==    by 0x6CFC301: dissect_mts_identifier (packet-dmp.c:2684)
==15134==    by 0x6D01A8F: dissect_dmp_envelope (packet-dmp.c:2935)
==15134==    by 0x6D01A8F: dissect_dmp (packet-dmp.c:3909)

Found by oss-fuzz.

Change-Id: I7c3896a9b64c25035fbe8b4ef6130cd693a515db
Reviewed-on: https://code.wireshark.org/review/25575
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-02-03 17:40:36 +00:00
Dylan Ulis 2d8606b584 CIP Motion: Support Format Revision 3
See Volume 9, version 1.2, sections "6-2.7.1.1" and "7-1.1"
1. Pass Connection Point from FwdOpen to Motion dissector, since that is now needed to parse I/O payload.
2. Move Run/Idle Header function to CIP dissector, since it's a CIP feature, not ENIP.
3. Add a protocol so that Format Revision 3 can be dissected without the Forward Open in the capture.
4. Minor: Highlight more bytes in some EPATH parsing.
5. Minor: Renaming some things to match spec wording.

Change-Id: I93626a6492be2675206d38c04fa1c7ce534c04ca
Reviewed-on: https://code.wireshark.org/review/25570
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-03 04:19:05 +00:00
Jakub Zawadzki e3a7676186 quic: fix secret memleaks.
It looks like that quic_create_cleartext_decoders() need to free secrets, tls13_cipher_create() only use it as const.

ASAN report:
ERROR: LeakSanitizer: detected memory leaks

Direct leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0x4e26e8 in __interceptor_malloc /src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:88
    #1 0x225b038 in g_malloc
    #2 0x1742014 in quic_derive_cleartext_secrets /src/wireshark/epan/dissectors/packet-quic.c:1071:10
    #3 0x173e579 in quic_create_cleartext_decoders /src/wireshark/epan/dissectors/packet-quic.c:1091:10
    #4 0x173dc89 in dissect_quic_long_header /src/wireshark/epan/dissectors/packet-quic.c:1221:14
    #5 0x173ced6 in dissect_quic /src/wireshark/epan/dissectors/packet-quic.c:1402:18
(...)

Direct leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0x4e26e8 in __interceptor_malloc /src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:88
    #1 0x225b038 in g_malloc
    #2 0x1741fd5 in quic_derive_cleartext_secrets /src/wireshark/epan/dissectors/packet-quic.c:1065:10
    #3 0x173e579 in quic_create_cleartext_decoders /src/wireshark/epan/dissectors/packet-quic.c:1091:10
    #4 0x173dc89 in dissect_quic_long_header /src/wireshark/epan/dissectors/packet-quic.c:1221:14
    #5 0x173ced6 in dissect_quic /src/wireshark/epan/dissectors/packet-quic.c:1402:18
(...)

Found by oss-fuzz/5902.

Change-Id: I6f8a4597411ee267773225e45043addb69928d66
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5902
Reviewed-on: https://code.wireshark.org/review/25571
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-02-02 22:27:41 +00:00
Jakub Zawadzki f244742b46 epl: fix map.title memleak.
Valgrind report:
==642== 14 bytes in 1 blocks are definitely lost in loss record 5,705 of 49,814
==642==    by 0xA966DCC: g_strdup_vprintf (gstrfuncs.c:507)
==642==    by 0xA966E88: g_strdup_printf (gstrfuncs.c:533)
==642==    by 0x6D523F4: dissect_object_mapping (packet-epl.c:4216)
==642==    by 0x6D56394: dissect_epl_sdo_command (packet-epl.c:3862)
==642==    by 0x6D56394: dissect_epl_asnd_sdo (packet-epl.c:3572)
==642==    by 0x6D59BC5: dissect_epl_asnd (packet-epl.c:3053)
==642==    by 0x6D59BC5: dissect_eplpdu.part.21 (packet-epl.c:2627)

Found by oss-fuzz/5907.

Change-Id: I6f4d2cea761581260af396c848ab1fded5641b44
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5907
Reviewed-on: https://code.wireshark.org/review/25573
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-02 20:31:10 +00:00
Graham Bloice 5cb7a729d3 Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM
We've added more fields, increment the pre-allocation amount.

Change-Id: Ia5f1aab7a2fa120049162d17a63f99bf21a3fe37
Reviewed-on: https://code.wireshark.org/review/25566
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02 14:56:22 +00:00
Dario Lombardo bec60fa461 packet-mq: Add support for IMS+TM Struct
Added support for IMS, TM, TMC2 Struct
Improve display some Flags in ID Struct
Fix display for FCNO Struct
Fix error in get_mq_pdu_len
Code reformat (VS2017)
Moved DEFINE to header file
More struct display fixed
Fix for IMS Msg len display

Change-Id: I80bfd25a5079598fc44124dc2c7b850640a38b00
Reviewed-on: https://code.wireshark.org/review/25295
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-02 05:22:18 +00:00
Stig Bjørlykke 0fda778b45 Qt: Fix splash screen "Registering dissectors" message
Adjust splash screen message used for registering dissectors when
finished fast from "Registering dissectors Registration finished"
to "Registering dissectors finished".

Change-Id: Id81cf08bb02bea0baa3ac0575b487e271641e27d
Reviewed-on: https://code.wireshark.org/review/25546
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-02 05:16:22 +00:00
Michael Mann dc86a285c1 SoupBinTCP: Remove try_conversation_dissector call
As stated in the #if 0ed out comments, It's not valid for a
soupbintcp subdissector to call conversation_set_dissector(), so
it shouldn't call try_conversation_dissector.  Just remove the
call entirely so it doesn't look like the removal is temporary.

Change-Id: I68d9b72360b52002692c369d7b202a8a215c0a96
Reviewed-on: https://code.wireshark.org/review/25555
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02 01:50:27 +00:00
Jakub Zawadzki 4a417149d4 Fix memleak in color_filters_read_globals()
Valgrind log:

==6102== Thread 1:
==6102== 32 bytes in 1 blocks are definitely lost in loss record 24,851 of 49,782
==6102==    at 0x4C29C4F: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==6102==    by 0xB17B7F7: __vasprintf_chk (vasprintf_chk.c:80)
==6102==    by 0xA98C2AB: vasprintf (stdio2.h:210)
==6102==    by 0xA98C2AB: g_vasprintf (gprintf.c:316)
==6102==    by 0xA966DCC: g_strdup_vprintf (gstrfuncs.c:507)
==6102==    by 0xA966E88: g_strdup_printf (gstrfuncs.c:533)
==6102==    by 0x6A66B8C: color_filters_read_globals (color_filters.c:704)
==6102==    by 0x6A66FBE: color_filters_get (color_filters.c:317)
==6102==    by 0x402313: fuzz_init (fuzzshark.c:237)
==6102==    by 0x40252D: LLVMFuzzerInitialize (fuzzshark.c:322)
==6102==    by 0x401E33: main (StandaloneFuzzTargetMain.c:125)

Change-Id: Ibc18edff6097eca736328810c903a151ddee22bc
Reviewed-on: https://code.wireshark.org/review/25553
Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-01 23:17:19 +00:00
Pascal Quantin 5c511d23e3 RTP: ensure that bta2dp_info and btvdp_info are always initialized
Bug: 14380
Change-Id: Ib691b067f25d7281be2f6b4387552252d16d0064
Reviewed-on: https://code.wireshark.org/review/25550
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01 18:20:12 +00:00
Lazar Sumar d7be8465b9 Fix endianness of CAN-ETH CAN packet
The CAN-ETH protocol explicitly states that the CAN identifiers are
transmitted in little-endian order, and the dissector now decodes it as
little-endian rather than host-endian.

Change-Id: I92c44b809caace31726e0d355363355eb32efa3e
Reviewed-on: https://code.wireshark.org/review/25549
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01 18:19:37 +00:00
Stig Bjørlykke 3f93c6e799 json: Adjust whitespace
Change-Id: Ifa10ca415d291ab6b0cb06c475ac8697b5fc96da
Reviewed-on: https://code.wireshark.org/review/25548
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01 16:56:36 +00:00
Pascal Quantin 40f0f6885f TDS: ensure to always initialize tds_encoding_char even when protocol is unknown
Otherwise we use an uninitialized variable

Bug: 14372
Change-Id: Idacdb40569421f7e41e181c14fb2bc033b0645b8
Reviewed-on: https://code.wireshark.org/review/25529
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01 03:07:06 +00:00
Uli Heilmeier b14e32cc77 New dissector Session Multiplex Protocol SMP
Adding Session Multiplex Protocol SMP
SMP is used by TDS when MARS in enabled.

Bug: 14110
Change-Id: Ia4113c627d107da6c3d51e4004265efb228a297b
Reviewed-on: https://code.wireshark.org/review/25509
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01 02:01:27 +00:00
Jakub Zawadzki 66af843eb5 bacapp: make sure to NUL terminate bf_arr.
bf_arr is used as %s argument to proto_tree_add_subtree_format(), so it need to be NUL terminated.
Add + 1 to bf_arr size, and use sizeof() in memset() calls.

ASAN report:

ERROR: AddressSanitizer: stack-buffer-overflow on address
0x7ff1b179f150 at pc 0x00000044cf31 bp 0x7ffdc7493cf0 sp 0x7ffdc74934a0
READ of size 258 at 0x7ff1b179f150 thread T0
SCARINESS: 41 (multi-byte-read-stack-buffer-overflow)
	#0 0x44cf30 in printf_common(void*, char const*, __va_list_tag*) /src/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_format.inc:548
	#1 0x498cfc in __vsnprintf_chk /src/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:1558
	#2 0x5775cf in proto_tree_set_representation /src/wireshark/epan/proto.c:5508:9
	#3 0x577eb1 in proto_tree_add_text_valist_internal /src/wireshark/epan/proto.c:1226:2
	#4 0x5782d5 in proto_tree_add_subtree_format /src/wireshark/epan/proto.c:1249:7
	#5 0x73c73f in fBitStringTagVS /src/wireshark/epan/dissectors/packet-bacapp.c:7490:15
	#6 0x73ad20 in fApplicationTypesEnumeratedSplit /src/wireshark/epan/dissectors/packet-bacapp.c:7569:26
	#7 0x73a484 in fApplicationTypes /src/wireshark/epan/dissectors/packet-bacapp.c:7635:12
	#8 0x7395db in fIAmRequest /src/wireshark/epan/dissectors/packet-bacapp.c:13412:14
	#9 0x7383e1 in dissect_bacapp /src/wireshark/epan/dissectors/packet-bacapp.c:14163:9

Found by oss-fuzz/5452.

Change-Id: I57e948904f707c5003a389431b009a37c1212e04
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5452
Reviewed-on: https://code.wireshark.org/review/25544
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-01 01:01:29 +00:00
Adrian Granados 85fed81b63 ieee80211: various fixes to the 802.11ax support.
Fixes/improves a few filter identifiers, typos, consistent
use of MHz (as opposed to Mhz), and fixes to the MCS map trees
in the HE Capabilities tag.

Change-Id: I5c761990237ccc241d95fb0b9b2d3f8f1263b460
Reviewed-on: https://code.wireshark.org/review/25530
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
2018-01-31 16:34:23 +00:00
Pascal Quantin 8398488b8c IAX2: always initialize src_vformat and dst_vformat
Bug: 14371
Change-Id: Icc027151fafd6db6ef8be18c9fc2ccf39518907f
Reviewed-on: https://code.wireshark.org/review/25531
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-31 15:52:33 +00:00
AndersBroman 1e05b8c894 [MEGACO] Clear megaco_command between commands.
Change-Id: I62b9c9e192a6d5079c183a5b2e3ca7fa82c5bf39
Reviewed-on: https://code.wireshark.org/review/25528
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-31 14:17:38 +00:00
Stig Bjørlykke f23feb339e hsrp: Fix UDP port number for HSRPv6
The UDP port for HSRPv6 was mistyped when UDP dissectors was converted
to use "auto" preferences in g2eb7b05b8c.

Change-Id: I4b6f634677d23d81fc197dbeb43ee3d91d9a111f
Reviewed-on: https://code.wireshark.org/review/25526
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-31 12:59:34 +00:00
Gerald Combs f5a8711ef1 Qt: About dialog updates.
Open lua scripts when double-clicked. Behavior depends on your system
configuration. Add tooltips accordingly.

Let Qt wrap the "Wireshark" tab information.

Set column widths by eyeballing their contents.

Elide the Folders and Plugins strings in the middle.

Fixup placeholder text capitalization.

Draw links using the palette link color.

Change-Id: Ic141eae05541480ec1e254c55fd81728d04713d9
Reviewed-on: https://code.wireshark.org/review/25510
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-31 04:55:37 +00:00
Jakub Zawadzki b81c5ad26f ieee1905: add missing NULL terminatator to ieee1905_reporting_policy_flags[].
Add missing NULL terminator to ieee1905_reporting_policy_flags[], in order to fix buffer overflow.

ASAN report:

ERROR: AddressSanitizer: global-buffer-overflow on address 0x0000092a4af8 at pc 0x00000062afd2 bp 0x7ffce7e468d0 sp 0x7ffce7e468c8
READ of size 8 at 0x0000092a4af8 thread T0
    #0 0x62afd1 in proto_item_add_bitmask_tree /src/wireshark/epan/proto.c:10406:9
    #1 0x62953f in proto_tree_add_bitmask_with_flags /src/wireshark/epan/proto.c:10786:3
    #2 0xfb8271 in dissect_metric_reporting_policy /src/wireshark/epan/dissectors/packet-ieee1905.c:2762:9
    #3 0xfb2997 in dissect_ieee1905_tlv_data /src/wireshark/epan/dissectors/packet-ieee1905.c:4390:18
    #4 0xfb23c8 in dissect_ieee1905 /src/wireshark/epan/dissectors/packet-ieee1905.c:4577:18

Found by oss-fuzz/5298.

Change-Id: I35dbd6d29d0a3a5560286146fbed172c810e5b2d
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5298
Reviewed-on: https://code.wireshark.org/review/25520
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-30 23:15:27 +00:00
Richard Sharpe 709757e996 radiotap: Refactor some aspects of the radiotap dissector.
One thing I hate is big slabs of open coding. Compilers are very good these days
and will inline functions if they are used in only one place.

By using functions we make the code very much more readible.

There is also a big opportunity to use functions like proto_tree_add_bitmask.

Change-Id: I66d1509f577d2955996f4649e05494ab0370ed01
Reviewed-on: https://code.wireshark.org/review/24964
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30 15:32:20 +00:00
Robert Jongbloed fc6c5be229 SIP: Fixed matching of INVITE request to INVITE response.
The sip_is_packet_resend() function sets the internal transaction_state to
final_response_seen, the prevents the sip_find_request() from finding the
matching INVITE as it expects transaction_state == request_seen. Simply
reversing the order of these functions seems to fix the problem.

Change-Id: I61d085c979dee24ad88b4eea26dfa002fd9cd213
Reviewed-on: https://code.wireshark.org/review/25429
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30 08:41:35 +00:00
Mališa Vučinić cdcf9d0817 ieee802154: Allow generic nonce to be passed in CCM* API.
CCM* algorithm  implemented as part of ieee802154 dissector can be
leveraged for higher layer protocols, e.g. OSCORE. This change adds an
additional parameter to the CCM* API in order to allow passing a generic
13-byte nonce.

Bug: 14367
Change-Id: Ib2da1146659f67ffb3a4767ec093f8b7f09461ce
Reviewed-on: https://code.wireshark.org/review/25455
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30 07:37:24 +00:00
ZHANG Rui a584eab239 New RTCP dissector for transport-cc
Bug: 14332
Change-Id: I49642a9880fc03d38942eebfd6b1015894fef23d
Reviewed-on: https://code.wireshark.org/review/25255
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30 05:46:47 +00:00
Robert Jongbloed 94d7500a7d SDP/RTP: Support for "bundled" media.
Modern SDP usage (e.g. SIP, WebRTC) can "bundle" multiple RTP media streams on
a single port. Thus the RTP dissector has to be able to handle audio and video
at the same time, so the gboolean flag in _rtp_info was changed to a bit mask.
The SDP parsing was then changed to detect multiple "m=" lines using the same
port, and combine their audio/video bit masks, and the rtp_dyn_payload used
has all the audio and video payload descriptions.

Change-Id: Ifa3c034260f892ed005fe28647d28f3b0b1b05cf
Reviewed-on: https://code.wireshark.org/review/25431
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30 05:43:54 +00:00
Richard Sharpe d328a58fc6 wifi-dpp: A number of further changes from the recent testing.
1. Add the crypto suite that came in with a spec change (v171212).
2. Add two additional fields that need handling.
3. Make the attribute value a separate sub-tree.

Change-Id: Ic01527bcd0361bf2522d2efbc91cd8191d7b2e27
Reviewed-on: https://code.wireshark.org/review/25514
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-30 05:01:57 +00:00
Martin Mathieson 42322ac8cf dct2000 wiretap: expect all lines to have exactly 4 subsecond digits.
Should fix clang warning created by https://code.wireshark.org/review/#/c/25492.

Change-Id: Iafa31e24cd786a510f3a953d615df4cbc3930fa6
Reviewed-on: https://code.wireshark.org/review/25508
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-30 00:42:10 +00:00
Michael Mann 6d29434c3f DNP3: Limit the amount of "empty" objects/fields can be present in a packet.
Chances are if there are a large number of "empty objects" (that don't increment packet
counter) it's an intentionally malicious packet and we should break the loop.

Bug: 14362
Change-Id: Id9a6f4270cc47188becdf4652f903d0ba4478dcb
Reviewed-on: https://code.wireshark.org/review/25497
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-29 10:46:53 +00:00
Michail Koreshkov c21b2e7f94 Display JSON in compact form
JSON will be display like in browswer developer tool (Firefox or Chrome).

Change-Id: Ib504f4828d9fd8d25d9564b93717007ac021713c
Reviewed-on: https://code.wireshark.org/review/25474
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-29 09:10:24 +00:00
Richard Sharpe f8bb0757f3 ieee80211: Implement two more extended IE from IEEE STD 802.11.
Handle the Estimated Service Parameters tagged element and the Future
channel guidance one. The second may need more work in future.

These are defined in IEEE STD 802.11-2016 but may have been defined earlier.

Change-Id: I1c67a0ea6df9c1cc89bb3a34da921f3938e0a012
Reviewed-on: https://code.wireshark.org/review/25407
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-29 06:53:43 +00:00
Richard Sharpe 67b2851002 radiotap: Mark unknown fields as unknown instead of reserved.
Change-Id: Iecfb705b37f54119eaec75ab8df8c7ee3c76bfec
Reviewed-on: https://code.wireshark.org/review/25503
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-29 00:36:28 +00:00
Michael Mann 907d8ff41f Protect UAT color "datatype" from an empty string
UAT color "datatype" has the format of #XXXXXX so the XXXXXX is strduped
to pass to strtol(). The "pointer math" assumed the # was always present
and would result in large memory allocation if string was empty.

Bug: 14357
Change-Id: Idc43b17f0e07705880d0d77f106991d10e09f072
Reviewed-on: https://code.wireshark.org/review/25504
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-29 00:03:16 +00:00
Craig Jackson 5c12473014 TDS: Dissect TDS4.2 response packet
Add dissection of the TDS response packet for TDS 4.2. In order to share code, this
required parameterizing TDS 7.x token-handling routines for things such as endian-ness
and one-byte vs two-byte character encodings. This required ascertaining accurately when
TDS 7.x is in use as early in the conversation as possible. This in turn required knowing
the program versions downloaded in the prelogin packet in the case where the login packet
is encrypted. (Listening to the LoginAck token is a little too late.)

Add more support routines to parameterize the endian nature of each connection.

Although the particular tokens decoded here are documented for TDS 4.2, it has only been tested
with a trace from TDS 4.6. TDS 4.6 didn't change much, but there may be a few minor errors.

Change-Id: I6f8f136bcc565640fbea4302cb79ea29a118d9a1
Reviewed-on: https://code.wireshark.org/review/25464
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-28 22:06:41 +00:00
Uli Heilmeier 21ee658f91 Infiniband: Decode AETH syndrome byte
Used reference:
Book "InfiniBand Network Architecture" by Tom Shanley; page 369 ff

Bug: 14359
Change-Id: I77e64ca16ccc5f193eac34b304165f722ffb0748
Reviewed-on: https://code.wireshark.org/review/25489
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-28 02:21:10 +00:00
Martin Mathieson baca10e725 DCT2000: after profiling, speed up some parts
Change-Id: Ia335aaca3368608fe495c887d846fe3f057b74dd
Reviewed-on: https://code.wireshark.org/review/25486
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-27 23:12:08 +00:00
Jaap Keuter ea6c209758 Reset file permissions
Some oddities with regard to file permissions have crept into
the repository. Reset execute rights on various files which do
not need them.

Change-Id: Ib05658072925d59fc682173673c5638d157a269a
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25490
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-27 18:48:40 +00:00
Martin Mathieson 98a218dcd3 Snort: speed up parsing of options by avoiding g_snprintf()
Change-Id: Ibe12ce69b139752e60b66a2af63e31244321bec5
Reviewed-on: https://code.wireshark.org/review/25484
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-27 08:28:30 +00:00
Alexander Gryanko 31769615bb http2: underscore replaced by dash in static headers name
Headers field "name" is used in the hash table for matching
field type while processing data. Browsers use dash as
delimiter while in the code we use underscore.

Change-Id: I6342af9328118b41a8c71e034ef5913a83a84459
Reviewed-on: https://code.wireshark.org/review/25478
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-27 04:13:59 +00:00
Lazar Sumar 0d5cbc7303 Added the Proconx CAN-ETH protocol dissector
Change-Id: I306341c7cddf8facb4a9ca62254a465a1da22174
Reviewed-on: https://code.wireshark.org/review/25423
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-26 03:19:50 +00:00
Joerg Mayer fb2fa4d776 Get rid of the necessity to use a preference to dissect ERSPAN type I packets.
Change-Id: I52c4c1fa5601bc66396f397ad23a9e53285a5926
Reviewed-on: https://code.wireshark.org/review/25463
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-01-25 21:33:47 +00:00
AndersBroman 6bd9be470e [PER] Fix the bitmask to calculate the number of bits needed to hold the
length.

Bug:14366
Change-Id: I79a8051b94feffeb5d667a664fdcff6680dec620
Reviewed-on: https://code.wireshark.org/review/25468
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 14:56:53 +00:00
Kenneth Soerensen 77a665a75c ZigBee: Fix change 25456 - Wrong attribute ID corrected
Change-Id: I06251e47feb6593bd940c3a719922abfa3241205
Reviewed-on: https://code.wireshark.org/review/25466
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-01-25 13:53:59 +00:00
Gerald Combs ba3f29b62f Don't use static GMutexes.
They're not supported in older versions of GLib.

Change-Id: I8342048bab90fb192b8d7f0253f8b3207be8c5b1
Reviewed-on: https://code.wireshark.org/review/25460
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 09:04:48 +00:00
Kenneth Soerensen 9149af9948 ZigBee: Add remaining attributes from Smart Energy Prepayment cluster
Change-Id: I7e35dd26d7369cbc39cdb1e078200306d6ada619
Reviewed-on: https://code.wireshark.org/review/25456
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 06:47:01 +00:00
Jaap Keuter 55fbeec607 bootp: DHCP User Class Data iPXE exception
iPXE seems to violate RFC 3004 by ommitting the UC_Len_i field in the
User Class Data field. Since this seems to be a 'well known' issue,
which is not going to be corrected, detect and circumvent the error
detection for this specific use.

Bug: 14312
Change-Id: I2a15c336d7f67ee5fd83f955de7126eac146bfb1
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25450
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 05:18:47 +00:00
Laszlo Papp ae5e83a25c OpenFlow(v5&v6) : Fix RX_PWR/TX_BIAS
Change-Id: Iae6fe2473d80cb14d5a9676b7efce41dc59a30e2
Reviewed-on: https://code.wireshark.org/review/25454
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 21:31:20 +00:00
Laszlo Papp fe00754226 Openflow: Use offset 2 for tx_min/max as they are uint16_t
Change-Id: I2f47e0ede2a31cfdadc69ab125a739b3deaa297e
Reviewed-on: https://code.wireshark.org/review/25453
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-24 18:13:30 +00:00
Laszlo Papp b3cf908ffe Fix the display of Length and Pad2 in the openflow dissector
Change-Id: I12194d1449812c43c062c50d319d44d6d7437c51
Reviewed-on: https://code.wireshark.org/review/25451
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 16:51:49 +00:00
Pascal Quantin 92af82aaa7 CVS pserver: fix infinite loop
Bug: 14364
Change-Id: I49377c5b06a7b3f2e919c8f8ae2c4d95b9b2c7eb
Reviewed-on: https://code.wireshark.org/review/25446
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-24 12:36:18 +00:00
Matej Tkac fa26a00876 [PFCP] Fixed Outer Header Creation IE
3GPP TS 29.244 V14.2.0 (2017-12)

Change-Id: If99b0701541a32e393d3fd19bbd013fd4abcbcc8
Reviewed-on: https://code.wireshark.org/review/25447
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 12:13:50 +00:00
Michael Mann 954fd253e4 Add duplicate value_string in check filter
Change-Id: Ie00d057f5bc36d65b6bba790169543a65b068e47
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/20744
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 11:48:53 +00:00
Jakub Zawadzki d672ee9372 wslua: fix nstime memory leak after passing unknown encoding to TvbRange_nstime()
Move checking of encoding before allocating nstime.
Found by clang.

Change-Id: I3c1de5fae6fcf52393cc38302359f21f17808087
Reviewed-on: https://code.wireshark.org/review/25442
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 08:34:32 +00:00
Robert Jongbloed cde023c3c5 SDP: Added support for "a=rtcp" and "a=rtcp-mux".
Modern SIP endpoints often use non adjacent, or the same, port for the RTCP
protocol as the RTP protocol. This is indicated via attributes in the SDP,
which should be used to set up the correct dissector for the correct port
on this SIP session.

Change-Id: I37bf30b71541b6f924fbda5ac1cb29f3ba171515
Reviewed-on: https://code.wireshark.org/review/25430
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 05:09:31 +00:00
Jaap Keuter 59c958d7cb cvspserver: Add basic cvs pserver protocol dissector
Change-Id: I049c8b9b9a0a1da2243217532186ba5a19cf5671
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25424
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-24 03:18:04 +00:00
Richard Sharpe 6605d844af QUIC: fix build with older Libgcrypt
RHEL7 ships with Libgcrypt 1.5.3 which does not support AEAD, add guards
to fix -Wunused-function errors.

Change-Id: I230a66eff0dca9a882bf87f2f740ee0d36cd1dc6
Reviewed-on: https://code.wireshark.org/review/25434
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-23 19:16:38 +00:00
AndersBroman 7ecf93c833 [MEGACO] Priority value gets displayed as Termitation Id.
Change-Id: If176231d1c71692b1d6a2627934d211e4f2476a7
Reviewed-on: https://code.wireshark.org/review/25433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-23 15:04:52 +00:00
Pascal Quantin 5d5482e2e6 USBMS: fix endianness of GET MAX LUN and RESET
While we are at it, let's add the protocol item to allow filtering on
protocol.

Bug: 14360
Change-Id: I4973a6e657dccd71af4f798584cc118b75bedd20
Reviewed-on: https://code.wireshark.org/review/25425
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 12:16:09 +00:00
Pascal Quantin c2daa6bc73 LTE RRC: register dissectors for UERadioAccessCapabilityInformation(-NB) and UERadioPagingInformation(-NB)
Change-Id: Idb3c3fe2cab4ce7aff2bfe108a6bd4fb07fe44b3
Reviewed-on: https://code.wireshark.org/review/25426
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 12:15:35 +00:00
Jakub Zawadzki 98305ba621 packet-ieee80211: fix dead store/ dead increment and assignment.
offset was not used after increment/assignment, just return it to relax clang.
Found by clang scan.

Change-Id: I21dece4e31075ca2da8d3ba942336fb4858636b6
Reviewed-on: https://code.wireshark.org/review/25419
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 18:23:06 +00:00
Martin Boye Petersen a6ae7f7571 ZigBee: Add a preference to choose ZigBee Smart Energy version used for dissecting
Some ZigBee commands within the Smart Energy Profile does not have the same payload
across different specifications. With this preference it is possible to choose what
version of the specification to use when dissecting payloads.
The default version is set to the latest one, which is Smart Energy 1.4, even though
it is still under development.

Change-Id: Iaec5528f2a418aeec4e39cfa087a58e531570d42
Reviewed-on: https://code.wireshark.org/review/25409
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-22 11:45:14 +00:00
Richard Sharpe 6358aadfd6 ieee80211: 802.11ax support.
This is based on Draft 2 of the standard. Draft 2 did not get approved, but
is close to what the final version will be and support is needed now by the
teams working on this.

Change-Id: I837df05a288b815e1e455883f4f165721104d51f
Reviewed-on: https://code.wireshark.org/review/24861
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-22 05:18:19 +00:00
Alexis La Goutte f0e1faac66 QUIC: Add define value for Long Packet Type (Initial, Handshake...)
Bug: 13881
Change-Id: Ia733a9e84e6a7dea58a62bcc1c9d79f51e5b46ff
Reviewed-on: https://code.wireshark.org/review/25401
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:45:17 +00:00
Alexis La Goutte 34a02eb70b QUIC: Remove draft-05 and draft-06
All tools use draft-07 or draft-08

Bug: 13881
Change-Id: I539e34324f16149fe8c0d05d938bae1298b9eb15
Reviewed-on: https://code.wireshark.org/review/25399
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:43:50 +00:00
Alexis La Goutte 68b20efb49 QUIC: Update IETF draft URL (draft-08)
and add also IETF QUIC TLS (-08) draft

Bug: 13881
Change-Id: I5662faeb5d1738c896ba66b6857e70baafd3afee
Reviewed-on: https://code.wireshark.org/review/25400
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:43:15 +00:00
Richard Sharpe 731a901a3e radiotap: Updates to the radiotap dissector to avoid confusion.
If a field is indicated as not known, then display that field as reserved
which will prevent people from searching for fields that are not known and
makes more sense.

Also, rename some of the hf fields to be more in line with standard practice.

Change-Id: I5cbbd682acbea3713b7b19325fe1a36cc0e36aa1
Reviewed-on: https://code.wireshark.org/review/25397
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-19 21:26:34 +00:00
Richard Sharpe 8d06115dbf ieee1905: Bring AP Metric TLVs into conformance with the SPEC
There was a missing field in the initial version of the spec. Add the
flags bits that define the subsequenct fields.

Change-Id: Ie237075f4f7f30adc4b280358fe5c985c63f5281
Reviewed-on: https://code.wireshark.org/review/25375
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-19 16:46:49 +00:00
Roland Knall 8631ceaefc epl: Correctly display the error for available bytes
Don't break the remaining length by setting and invalid one

Change-Id: Ia32798db73937ada6c99a6927cc87402603a9e75
Reviewed-on: https://code.wireshark.org/review/25391
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-19 13:25:51 +00:00
Alexis La Goutte 6d82ea91fd RVSP: fix typo found by conflict hf
'rsvp.template_filter.ipv4_tunnel_sender_address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'rsvp.template_filter.sub_group_originator_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES

Change-Id: I922ef6742c7f340519adc6014ec37e29cb0e34c7
Reviewed-on: https://code.wireshark.org/review/25390
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-19 13:01:51 +00:00
Dario Lombardo 1b5624a718 plugin_if: don't allocate memory and cast it instead.
Glib hash table can use integers as pointer by casting them
using GINT_TO_POINTER. This prevents alloc/free of memory.

Leak found by clang.

Change-Id: Ieae4d1ec787e41aef0657d27bdaefe30d12e2b80
Reviewed-on: https://code.wireshark.org/review/25341
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-19 12:32:08 +00:00
Pascal Quantin ecced16299 S1AP: upgrade dissector to v15.0.0
Change-Id: I2c2a0f8093678769427ff4303ad41a5c97bdd05c
Reviewed-on: https://code.wireshark.org/review/25379
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-19 04:06:32 +00:00
Prashanth Pai dcacea5c15 glusterfs: Add support for getvolumeinfo procedure
Bug: 14347
Change-Id: Ib8fcaa5f0af06d1f1141dbb51696d88fde7d71ba
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: https://code.wireshark.org/review/25335
Tested-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-01-18 14:52:55 +00:00
Matej Tkac a6e64bfc78 [PFCP] Corrected Header Fields in Report Type IE
Change-Id: If50a4bf79edd69d14015b4262d5195d581082cc4
Reviewed-on: https://code.wireshark.org/review/25367
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-18 14:08:39 +00:00
Pascal Quantin 8791e0b61f 3GPP NAS: rework PCO loop to better report extra data at the end of the payload
This will help identifying that the packet contains unexpected data at the end
rather than triggering a malformed error when trying to fetch outside of
the tvb.

Change-Id: Ieb71204f3c364e809447157e7a71c3eb92620d85
Reviewed-on: https://code.wireshark.org/review/25366
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-18 12:08:45 +00:00
Dario Lombardo de0872971a cmake: add ps.c to the checkAPI list with the proper path.
This removes an error when running cmake target checkAPI_epan.

No such file: "ps.c" at wireshark/tools/checkAPIs.pl line 2144.

This error is related to out-of-tree builds. In-tree builds are not
affected since the generated files live next to the versioned ones.

Change-Id: I3a6b05eaf4b7bb703222c47233576d0cb77e66d1
Reviewed-on: https://code.wireshark.org/review/25330
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-01-18 11:01:38 +00:00
Pascal Quantin 2996ef2304 LPP: upgrade dissector to v14.4.0
Change-Id: I87406dd9311bd6e379a38c66ec61c1c2d8d9412f
Reviewed-on: https://code.wireshark.org/review/25365
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-18 10:03:58 +00:00
Pascal Quantin be958a7116 X2AP: upgrade dissector to v15.0.0
Change-Id: Ib2e01a19f5b4f37fcee7bdf3b2ed231c5606162a
Reviewed-on: https://code.wireshark.org/review/25357
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-18 07:16:36 +00:00
Guy Harris c327f7d599 Constify some pointers.
Change-Id: I4f443f777c92fa62fbe2448e891ba93d02fde3ad
Reviewed-on: https://code.wireshark.org/review/25362
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-18 06:09:23 +00:00
Dario Lombardo 48b4b3bdad dcerpc: remove use-after-free (found by clang).
Change-Id: I6db7e47fc5e67afcad78763cb739a3f13a47b923
Reviewed-on: https://code.wireshark.org/review/25352
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-18 06:07:02 +00:00
Guy Harris e6d47cb7b3 Don't cast away constness if it's not necessary.
Change-Id: Ic5ecf4628f03c63b68fadd9ffed49cfd5497d99c
Reviewed-on: https://code.wireshark.org/review/25361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-18 06:00:59 +00:00
Guy Harris a6167ef73d Don't cast away constness if it's not necessary.
Change-Id: Ie87983f5cbe38266e4f522613b21d25d67ef328f
Reviewed-on: https://code.wireshark.org/review/25360
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-18 05:51:44 +00:00
Guy Harris eec528cc70 Make a pointer const that has no need not to be const.
Change-Id: I32c86988823fcea96239b199bf21b98ee3ec8a5e
Reviewed-on: https://code.wireshark.org/review/25359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-18 05:48:46 +00:00
Stig Bjørlykke d86f820206 coap: Change Uri-Path from hidden to generated
This field is generated so mark it so.  It may also be usable so
make it visible.

Change-Id: I10d951f234f1fba240059bc791b40d25dede07a9
Reviewed-on: https://code.wireshark.org/review/25350
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-17 14:10:44 +00:00
Dario Lombardo 34381ed20c stat_tap: don't use-after-free (found by clang).
Change-Id: Ie7304ad70c8cf3ac62abdf07aaa94d12c409f1b0
Reviewed-on: https://code.wireshark.org/review/25339
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-16 22:31:51 +00:00
Richard Sharpe a069a4f856 ieee80211: Add support for EAPOL Key MIC lengths other than 16.
This allows the user to override the EAPOL Key MIC length for those
crypto suites where the Key MIC length is greater than 16 bytes.

This works in the DPP case where the Key MIC length is supposed to be the
same as the Nonce length.

Change-Id: I8ef6bc978e0a44ece0e95d76b231a02c7f15c89b
Reviewed-on: https://code.wireshark.org/review/25332
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 06:08:48 +00:00
Alexis La Goutte d3c6cdde5b QUIC: fix Padding Frame
Padding frame can be anywhere on QUIC payload
Add loop check if it is always padding frame (0x00)

Bug: 13881
Change-Id: I3d50e5347aeca9738aeac3287ddba7fd30fc72b1
Reviewed-on: https://code.wireshark.org/review/25324
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 05:28:54 +00:00
AndersBroman 1b9de188ff [SIP] Display tel uri in VoIP calls.
Change-Id: I0a4eb85abd75ed706ea519371f2c62b172c05297
Reviewed-on: https://code.wireshark.org/review/25326
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-15 14:34:57 +00:00
Alexis La Goutte e2ab8151b6 QUIC(TLS): Add new error code from draft-07
Bug: 13881
Change-Id: I7ef7fd2081d74991219e40f695635e4c00d20365
Reviewed-on: https://code.wireshark.org/review/25320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-15 07:53:17 +00:00
Guy Harris c3190d9d70 Fix build with libz not configured in.
Change-Id: I1a336eb5a19ddc9215a9598d176794cfa214863c
Reviewed-on: https://code.wireshark.org/review/25314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-14 20:40:18 +00:00
Peter Wu 2c3c49cd37 ssl: fix reassembly for very small TCP segments
A capture with a Server Hello failed to be dissected because the record
was split in TCP segments of one byte each. This resulted in a
"Malformed Packet" exception because ssl_looks_like_sslv2 looks at the
third byte which. To fix this, ensure that at least the size of a TLS
record is available.

Change-Id: I8558028a28169020bc6549fdac29e07ecedf6ce2
Reviewed-on: https://code.wireshark.org/review/25310
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-14 15:15:30 +00:00
Peter Wu e8089003ca TLS13: update for draft -23 (new version and extensions)
Renumber key_share extension, display the old codepoint as "Reserved
(key_share)" in case an older draft version is loaded. The old codepoint
(40) was apparently used for different purposes:
https://www.ietf.org/mail-archive/web/tls/current/msg25168.html

Add a new "signature_algorithms_cert" extension which is similar to
"signature_algorithms", except that it advertises the supported
algorithms in certificates rather than handshake messages.

Change-Id: Ibbb09100e2540deea8f652ba0685feadb68f33e7
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/25309
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-14 14:43:12 +00:00
Alexander Gryanko d06b60db71 http2: headers filter with UAT support
Make HTTP2 headers filterable.

Change-Id: I1a1a42ccdb41461f048e9ae462421ecad79da61b
Reviewed-on: https://code.wireshark.org/review/24475
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-01-14 14:16:44 +00:00
Anton Glukhov db5d4e10de Fix lldp 802.3br typo
Change-Id: I8b69922c2bbb7905480277e7b28d9894453e785b
Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/25284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-14 08:34:47 +00:00
Guy Harris ae199f2eb9 Add packet-nr-rrc.h to the list of headers.
Change-Id: I7c59fef73a267aeb427eafff1e12e0b2b5ee05a1
Reviewed-on: https://code.wireshark.org/review/25305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-14 03:15:01 +00:00
Pascal Quantin c634a73c95 LTE RRC: upgrade dissector to v15.0.1
Change-Id: If0b6fe029b5f852250fde36ead5dc5bb03d44e28
Reviewed-on: https://code.wireshark.org/review/25304
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-13 19:36:06 +00:00
Uli Heilmeier d1db7f1edf NTP: Updated system and peer status codes
Used reference:
https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03
http://doc.ntp.org/current-stable/decode.html

Bug: 14271
Change-Id: Iab829e31206f99b3458f68c6c65cc6188916a3bb
Reviewed-on: https://code.wireshark.org/review/25296
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-13 15:34:58 +00:00
Stig Bjørlykke 55553f1a38 Qt: Don't use the term "extcap" interfaces in UI
Use the term "external capture interfaces".

Change-Id: I216ce2273737b58e4922c476416333ba16d6cb30
Reviewed-on: https://code.wireshark.org/review/25298
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-13 13:44:25 +00:00
Pascal Quantin 9dfd17b104 UMTS MAC: protect against an out of bounds access
Bug: 14339
Change-Id: Idd145b00218fb37c0c193df5af2f89a9503a036e
Reviewed-on: https://code.wireshark.org/review/25297
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-13 13:37:03 +00:00
Richard Sharpe e5eb3e480d ieee1905: More changes from the recent bakathon including two more TLVs.
Change-Id: I010c9aa1a3ad7c599a6de13ac79320233698426b
Reviewed-on: https://code.wireshark.org/review/25293
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-13 08:27:21 +00:00
Gerald Combs 807a6c93d8 netfilter: Make sure our bitmask field arrays are NULL terminated.
Add a trailing NULLs so that we don't read past the end of
hfi_nfct_attr_status_flags and hfi_nfexp_attr_flags_bitfield.

Bug: 14336
Change-Id: I1e96a89f60df2d653c4f3ad63f29cf57eb0224a5
Reviewed-on: https://code.wireshark.org/review/25290
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-13 08:14:21 +00:00
Gerald Combs 777932efc6 make-dissectors depends on copy_cli_dlls.
Have the make-dissectors CMake target explicitly depend on copy_cli_dlls,
otherwise we might try to create dissectors.c before libglib-2.0-0.dll
has been copied into place. It looks like this is what's been causing
our random Windows PD failures.

Change-Id: Ia2445f17abd2c73113ab269ba6c606f48e724d93
Reviewed-on: https://code.wireshark.org/review/25292
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-13 00:47:48 +00:00
Dario Lombardo 7ff58d9bca ctdb: don't dereference a null ptr (CID: 1427427).
Change-Id: Icb20a3c496e76be530a7c72336bf3b866d6edfcd
Reviewed-on: https://code.wireshark.org/review/25274
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-12 18:09:12 +00:00
Uli Heilmeier f98cf967bd NTP: Decode data of opcodes 8,9,10,11,12
Decode additional data of NTP opcodes 8,9,10,11,12 only as one string.
There's room for improvement to dissect the string for all the
name=value pairs. To do so more samples of different implementations are
needed.

Used reference:
* https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03
* http://doc.ntp.org/
* sample captures attached to bug

Bug: 14270
Change-Id: I4da537bf2a984b673845333714d8a8cb873f3147
Reviewed-on: https://code.wireshark.org/review/25281
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-12 15:34:56 +00:00
Dario Lombardo b08dc851c7 prefs: init capture_no_extcap.
Change-Id: Id5706f5268735e051dbd8e824ab909e91fea691b
Reviewed-on: https://code.wireshark.org/review/25279
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-01-12 14:31:56 +00:00
Pascal Quantin 9b705928c2 Lustre: add missing NULL terminator to flags lists
Bug: 14331
Change-Id: I439b1fe36ecb2e063146d7aebf517d842d4f8a4c
Reviewed-on: https://code.wireshark.org/review/25277
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-12 11:17:15 +00:00
Nick James 4df45ca7ce FP: Removed channels UAT
This UAT was limited (allowed configuring RACH channels only) and hasn't been extended for 4 years now.
There is also a heuristic dissector for RACH channels so pre-configuring them is unnecessary.

Change-Id: I266d2a0aba179318e1c28e0d5bc2b60860962fb2
Reviewed-on: https://code.wireshark.org/review/25270
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-12 08:19:12 +00:00
AndersBroman ddf8d8704d [Thrift] Make it easier to make specific Thrift dissectors
Introduce functionallity simmilar to packet-ber.c

Change-Id: Ibb76e2db870c9a9dd8b26067b59a20044aafbd85
Reviewed-on: https://code.wireshark.org/review/25266
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-11 21:39:13 +00:00
Pascal Quantin 4e13791a09 LNet: fix memory illegal access reported by Coverity (CID 1427262)
Change-Id: Iad925f32364eb9fb21da7032284044469dcbddc5
Reviewed-on: https://code.wireshark.org/review/25241
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-11 12:58:24 +00:00
Jaap Keuter 997cf938bd Add message number for wlan eapol 4-way key exchange
Since the message number isn't explicitly encoded in the protocol there
is no field to filter on. It is however derived from the message
contents and added in the info column.
Adding this as a generated field allows searching for and filtering of
these messages.
As requested before, last at SF'17 EU.

Change-Id: Id77612f0178710d30ea815335b0a54339d5d7b2c
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25257
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-11 11:48:01 +00:00
Pascal Quantin a6f58356dc NAS EPS: make some helpers functions static
Change-Id: I6a98c10687a6ffbbe6aa59d91fa52fed47dcae66
Reviewed-on: https://code.wireshark.org/review/25264
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-11 11:46:28 +00:00
Guy Harris 72edf4e250 Another fix for AT_STRINGZ addresses.
Change-Id: Ib1dc1b59851b87e7e3f83cfc888a494ca94cb289
Reviewed-on: https://code.wireshark.org/review/25261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-11 09:37:55 +00:00
Guy Harris eb5d12c4b9 For AT_STRINGZ, the length *includes* the null terminator.
The correct length for an AT_STRINGZ address of "" is 1, not 0.  A
length of 0 for an address is valid only if the pointer-to-address-data
is null.

Change-Id: I1da6de5ed402020ed5c8389a911870a54fa8b14a
Reviewed-on: https://code.wireshark.org/review/25258
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-11 09:31:43 +00:00
Peter Wu c1719a8bf3 h223: fix warning related to circuit_id in circuit_chain_lookup
Fixes a build failure when building the wireshark-git package on Arch
Linux using GCC 7.2.1:

    epan/dissectors/packet-h223.c: In function ‘dissect_mux_sdu_fragment’:
    epan/dissectors/packet-h223.c:207:13: error: variable ‘circuit_id’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]

Fixes: v2.5.0rc0-1698-g800b26edbe ("Remove circuit API")
Change-Id: I0b63f692e840e852680467b25ba3c3dfd31392ed
Reviewed-on: https://code.wireshark.org/review/25251
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-11 03:22:36 +00:00
Gerald Combs 5639b8014a Use an enum for plugin types.
Make plugins.c the source of truth for plugin names. Where plugins
reside and what they do are two different things, so split the plugin
directory and description into two separate elements.

CMake creates portable[1] builds on Windows and macOS. That is, the
build-time directory layout is the same as the installation directory
layout. Adjust various plugin paths macOS accordingly.

[1] You have to run osx-app.sh on macOS to prepare the application
bundle, but the goal is to create a directory/bundle that can be moved
or copied to a different system and run in the new location.

Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743
Reviewed-on: https://code.wireshark.org/review/25166
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-11 00:58:43 +00:00
Alexis La Goutte 841e24d304 TLS(QUIC): minimal Transport Parameter Length is 22
only 3 parameters are mandatory, so 3 * 4 (type + length), 2 * 4 (initial_max_stream_data + initial_max_data) + 2 (idle_timeout) = 22

See https://github.com/quicwg/base-drafts/issues/1042

Bug: 13881
Change-Id: I971b0badb81086bb4bf018cb4471973a3950ee50
Reviewed-on: https://code.wireshark.org/review/25184
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 21:51:01 +00:00
Niels Widger d122ba3a53 CoAP: Shift block mflag so it is 0/1 instead of 0/8
Shift the value stored in coinfo->block_mflag in
dissect_coap_opt_block so that we store 0/1 instead of 0/8.

Change-Id: I45ac08564ff1fdcaf4e7306692db862b6a70989b
Reviewed-on: https://code.wireshark.org/review/25248
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Niels Widger <niels@qacafe.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-10 21:24:56 +00:00
Guy Harris 37e364b241 Improve handling of VOIP VLAN queries and replies.
For queries, there appear to be two different versions, one with a
2-byte value of some unknown type and one with a 1-byte value that
appears to be an "appliance type" code followed by a 2-byte VLAN ID.

For replies, there only appears to be a version with a 1-byte "appliance
type" followed by a 2-byte VLAN ID, but handle a too-short payload.

Also point to http://www.rhyshaden.com/cdp.htm in some comments.

Change-Id: If1b476d5e6b23c7e0ba027835c6f0c84c8b723b7
Reviewed-on: https://code.wireshark.org/review/25249
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-10 20:17:10 +00:00
Erik de Jong 182112c10d LoRaTap: decode as for UDP
Allow decoding of LoRaTap in UDP packets like used by gr-lora (https://
github.com/rpp0/gr-lora) for instance.

Change-Id: I812c428db840a646b6fb22437037dcb8fab39370
Reviewed-on: https://code.wireshark.org/review/25247
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-10 19:51:17 +00:00
Alexis La Goutte 2a368b3ab6 QUIC: Add new error code from draft-08
UNSOLICITED_PONG (0xB):  An endpoint received a PONG frame that did
not correspond to any PING frame that it previously sent.

Bug: 13881
Change-Id: I8f3daf46965b93007dd178622f3ebd7c187b11e7
Reviewed-on: https://code.wireshark.org/review/25239
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 13:54:38 +00:00
Alexis La Goutte 83e8adccde QUIC: Add PONG frame type from draft-08
Bug: 13881

Change-Id: I2f67e6f0fa8c517e143b3e352b0bc0297994d439
Reviewed-on: https://code.wireshark.org/review/25238
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 13:53:40 +00:00
Pascal Quantin 85c9780f43 NAS EPS: upgrade dissector to v15.1.1
Change-Id: I52a7124cf6f6c6e267525514e44e6c2903a11725
Reviewed-on: https://code.wireshark.org/review/25243
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-10 10:54:53 +00:00
Pascal Quantin bcefb0c8e6 Lustre: capitalize comment to please GCC7
Change-Id: I30c31dcdbfdfd99dfe204e2ba67a221f356a5088
Reviewed-on: https://code.wireshark.org/review/25242
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-10 10:25:40 +00:00
Uli Heilmeier 80cd3859d1 BGP: Resolve AS23456 to AS_TRANS
AS23456 is reserved in RFC6793 for 32-bit AS number range as AS_TRANS.
Add an additional text "(AS_TRANS)" to AS 23456 items.

Bug: 14305
Change-Id: I1a0ea9e07c74b7e409cb32e2da55dbf233a2348d
Reviewed-on: https://code.wireshark.org/review/25172
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 06:00:19 +00:00
Alexis La Goutte be143963f6 BGP: Add dissection of data field on BGP NOTIFICATION message (OPEN/Bad Peer AS)
Bug: 14304
Change-Id: Ic69b43c58f9e02f91900dc618e4429cfc6ddfcac
Reviewed-on: https://code.wireshark.org/review/25217
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 05:32:06 +00:00
Pascal Quantin 88abff68df NR RRC: add initial dissector based on v15.0.0
ASN.1 prose imported from the specification and heavily modified
manually to workaround its poor quality.
Some of them are marked with -- WS modification comment, some are not.
Probably useless as-is, but it is an initial start until an updated
version is available.

Change-Id: I19ab6cedb6aa23c8ed57bae525ee4a3391494e32
Reviewed-on: https://code.wireshark.org/review/25235
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-10 05:31:33 +00:00
Uli Heilmeier fb4953a13c lustre: fix format 'long unsinged int' error
Change-Id: I764aa32c5571e667917c202feb70612dd877fc40
Reviewed-on: https://code.wireshark.org/review/25231
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 21:50:44 +00:00
Gerald Combs a7e29d8b66 WCP: Add a length check.
Add a bounds check for the current window. Blind attempt at fixing bug
14251.

Bug: 14251
Change-Id: Ia3775bcabb2dc633b6994547125e53a4fe23451e
Reviewed-on: https://code.wireshark.org/review/25230
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 21:23:35 +00:00
Uli Heilmeier 369cdcc553 NTP: Update values for opcode
Used refs:
https://github.com/ntp-project/ntp/blob/stable/include/ntp_control.h
https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03#section-4

Ping-Bug: 14270
Change-Id: Ie2a30ef316f85313f6f626772c6544c315db5b68
Reviewed-on: https://code.wireshark.org/review/25232
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 21:22:33 +00:00
Stig Bjørlykke c51560985a Fix tvbparse recursion limit check.
When doing recursion check we must also count down when done.

Bug: 14253
Change-Id: Icacc86e8b25e106e151117dbcc2f132b1bbe898e
Reviewed-on: https://code.wireshark.org/review/25226
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-09 16:21:36 +00:00
Dario Lombardo d769b7cb7a lustre: add missing breaks (fix gcc-7 compilation).
Change-Id: I00f0901853818df5f6bf67d7d75720067d66ee50
Reviewed-on: https://code.wireshark.org/review/25225
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Nathaniel Clark <nathaniel.clark@misrule.us>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-09 15:28:51 +00:00
Michael Mann 3f2f16411f Convert GUI layout preferences to use preference effects.
Another simple example of how to use preference effects to limit
the times a capture file is redissected unnecessarily.

Also clean up some of the grammar of preference effect descriptions.

Change-Id: I2db92e8e3ee913d3b37162916bd0ef7ac8ecd794
Reviewed-on: https://code.wireshark.org/review/25175
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 13:09:18 +00:00
Stig Bjørlykke 4e87f6c01a proto: Small code cleanup in proto_register_protocol
- Remove unneeded assignments
- Fix some comments and whitespace

Change-Id: I79de66315db29fe7c59fc18f3b3b464ac55121c8
Reviewed-on: https://code.wireshark.org/review/25221
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 13:07:32 +00:00
Graham Bloice 5f24a78113 Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM
We've added more fields, increment the pre-allocation amount

Change-Id: If0e68697c797e8709349a59b86fbcd4397730476
Reviewed-on: https://code.wireshark.org/review/25220
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 11:52:12 +00:00
Dario Lombardo 22b5ffad86 extcap: add preference to prevent interfaces loading.
Change-Id: Ia5865a40c75e582f28408a0515c5c0b38e43a916
Reviewed-on: https://code.wireshark.org/review/25188
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-01-09 09:58:48 +00:00
Erik de Jong 0a8d6cf97e LoRaTap/LoRaWAN: Add decode as and fix field types
Allow LoRaTap syncword field to be used for "decode as".
Fix field types for LoRaWAN EUI fields to display as EUI-64 little endian.

Change-Id: I584f338031a4bc87e127d35a7bf8751a60e93d55
Reviewed-on: https://code.wireshark.org/review/25199
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 06:39:02 +00:00
Nathaniel Clark 958374f352 [lustre] Initial Lustre support
This interperates the main body of Lustre traffic.
This dissects all current Lustre OPCODES (as of Lustre 2.10.2)
This dissects MDS REINT sub-opcodes
This dissects LDLM Intent opcodes
This dissects LLOG EADATA

Conversation matching is just IP based and not IP/port based.
Only one lustre "instance" can be running on a given host at a given time,
and request / reply pairs aren't don't always match by port numbers.

Add exception for lustre_* structure names in PROTOABBREV.
We have several lustre.lustre_* because the internal lustre structre is
named lustre_ (i.e. lustre_handle or lustre_msg_v2)

This is still a work in progress, as there are missing FLAG values
and some LLOG EADATA structures that aren't fully decoded.

Change-Id: If57085e2692565336e49f40fb475ca1035da7a35
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24800
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09 06:38:05 +00:00
Guy Harris 7c56f4776b Clean up dissection of "power requested" and "power available" TLVs.
Fix the addition of power values to the top-level item for the TLV so
that it actually adds power values.

Make the list of power values in that item display correctly, without
extra commas.

Fail if the length of the TLV is less than 8.  (We should really add an
expert info item for that.)

Change-Id: Ic4229c0652306f69156b8341c9fbb67cacc8154c
Reviewed-on: https://code.wireshark.org/review/25215
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-09 05:09:53 +00:00
Guy Harris af0f49e80d Use pcapng as the name of the file format.
At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.

Make Wireshark reflect that.

Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-09 00:38:51 +00:00
Gerald Combs 94479aded1 Limit tvbparse recursion.
Add a recursion check to tvbparse so that we don't overflow our stack.

Bug: 14253
Change-Id: I0f667c3720311318267a1184b33e33253f8ff729
Reviewed-on: https://code.wireshark.org/review/25202
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-08 23:55:13 +00:00
Guy Harris 69e1bdd62b More information on the Windows Console and escape sequences.
Change-Id: I8a57053658ef17d28c28c458e8fe5350332a953b
Reviewed-on: https://code.wireshark.org/review/25201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-08 21:09:39 +00:00
Guy Harris 0655931f60 Point to the MSDN blog post about 24-bit color support in cmd.exe.
Change-Id: Ic23f1d6ee35333ab4775970455f71315925f4cc6
Reviewed-on: https://code.wireshark.org/review/25200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-08 20:51:14 +00:00
Gerald Combs a6a5b552ec Update a comment about Windows Console color support.
Change-Id: I39171a3c95ca48a39fbbc90ceadb9b1436f2402c
Reviewed-on: https://code.wireshark.org/review/25196
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-08 19:45:50 +00:00
Gerald Combs 15746e5922 Add a mutex for the protocol registration callback name.
Fixes TSAN warnings on macOS.

Change-Id: I6cef7b49874011fd2da2c8dd15b59ce2ae08537a
Reviewed-on: https://code.wireshark.org/review/25185
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-08 16:38:29 +00:00
AndersBroman 7a19320df1 [Thrift] Dissect Thrift over SSL.
Change-Id: Ifa7676decc3b853a41c16bd962a25da6ccfac7c7
Reviewed-on: https://code.wireshark.org/review/25193
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 15:00:24 +00:00
Uli Heilmeier b5e744bca2 OSPF: Dissect LS Type bytes of OSPFv3 LS Request
Dissecting of LS Types bytes for LS Requests was missing.
Dissecting of LS Types bytes for LS Acknowledgments have been implemented.

Bug: 14310
Change-Id: I13d5b564a1e97f0c5a33c749273b11f94c90cbc0
Reviewed-on: https://code.wireshark.org/review/25183
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 09:13:45 +00:00
Will Robertson 8738b3e45a [Kingfisher] Include extra function types to allow dissection of additional messages
Change-Id: I6a2c17785ea58a1c0661bee5879099bc838f6bc3
Reviewed-on: https://code.wireshark.org/review/25191
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 09:10:26 +00:00
Stig Bjørlykke 985f7d023e tetra: Capitalize protocol short name
Change-Id: I8287c4492b9eab087b98820f7bd69b1bbe3b66fa
Reviewed-on: https://code.wireshark.org/review/25190
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-08 08:27:12 +00:00
Stig Bjørlykke 5699243ce1 chargen: Capitalize protocol short name
Change-Id: I26b938a44e696fafb715eb30f2e6780ec812fb2f
Reviewed-on: https://code.wireshark.org/review/25189
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-08 08:27:04 +00:00
Dario Lombardo e80b40adbe extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 05:50:15 +00:00
Uli Heilmeier 6f93baced0 CDP: Resolve 802.2 Protocol type protocols, show IPv6
Protocols of protocol type 802.2 (PT = 2) are encoded with the
"normal" ethernet type when PT length == 8.

Used reference: https://docs.fd.io/vpp/17.10/d2/d71/cdp__protocol_8h_source.html

Show IPv6 addresses as IPv6 and not as bytes.

Change-Id: I0f192e758bcc1a562f042609fa5d0d9527551bb8
Bug: 14311
Reviewed-on: https://code.wireshark.org/review/25168
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-07 16:09:13 +00:00
Kenneth Soerensen b3394a76ab ZigBee: Enable heuristic dissection of Tunneling cluster payload
The Smart Energy Tunneling cluster can carry various payloads.
The type of payload is determined when the tunnel is established.
However, we cannot be sure to capture the tunnel establishment and
therefore heuristics are used to determine the payload type.

The IP protocol is added as a heuristic dissector because the
specification allows IP in the tunnel payload. However, the only
real life payload type I am aware of is GBCS messages in
UK Smart Metering (https://smartenergycodecompany.co.uk).

Finally, if a heuristic dissector cannot be found, the Data
dissector is used.

Change-Id: I4942bf00d0d0efe7047db6494cd4f8a9d19c96b6
Reviewed-on: https://code.wireshark.org/review/25181
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-07 16:08:01 +00:00
Gerald Combs f5f6ceeb66 [Automatic update for 2018-01-07]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I65801bc1440f64c28ee003e23be2ca528bc1adc8
Reviewed-on: https://code.wireshark.org/review/25178
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-07 08:16:08 +00:00
Guy Harris e429e9ac7e Do SMB_COM_SEARCH or SMB_COM_FIND results ever have a Unicode file name?
Change-Id: I11d3091bdaa7d4ecff66c238e45b265a57ef1af7
Reviewed-on: https://code.wireshark.org/review/25177
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-07 03:03:05 +00:00
Michael Mann 603bb5097d Set captures preferences for PREF_EFFECT_CAPTURE.
This is a simple example of changing preferences that don't
affect dissection to something else, so that changing them
doesn't cause a file to be redissected unnecessarily

Change-Id: I77c64c739e8bbc9f2a202f744f27cb07be4a822b
Reviewed-on: https://code.wireshark.org/review/25173
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-07 00:06:21 +00:00
Guy Harris 7165b60879 Note that the object size type is, in effect, size_t.
We currently accumulate all of the object data in memory, so we can't
support objects whose size doesn't fit in a size_t; that means the
maximum object size is 2^32-1 bytes on ILP32 platforms, even though we
allow the size to be up to 2^63-1 bytes.

Change-Id: I2b45f2f1a6a4a68c97d34931aea6f5294db41b6e
Reviewed-on: https://code.wireshark.org/review/25174
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-06 23:33:06 +00:00
Michael Mann eef3c8434d Add ability for preferences to determine what they can change.
Add flags field to preference structure to help determine what
areas of Wireshark are affected by a preference changing.  The
intent is to be able to distinguish dissection from GUI or other
changes that are not dissection.

The default is to have all preferences affect dissection, but their
flags can be changed.  This patch doesn't change any flags from the
default.

Change-Id: Ied5ae961bc3f33f5b730b2892fff3fa0898380b8
Reviewed-on: https://code.wireshark.org/review/25171
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-06 17:49:23 +00:00
Gerald Combs a65391f901 TShark: Fix color handling on Windows.
Use SetConsoleTextAttribute to reset our colors on Windows. Update the
release notes and man page.

Change-Id: I2bc309787f9c2331324503092bd1c9ae6360eb55
Reviewed-on: https://code.wireshark.org/review/25170
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-06 14:30:45 +00:00
Stig Bjørlykke 29798bb8c9 bluetooth: Group Bluetooth dissector preferences
Change-Id: Ib5360fcbfd8f6b2aee6b33ec7d9dc77362feb50e
Reviewed-on: https://code.wireshark.org/review/25162
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-06 14:30:10 +00:00
Nick James 9295535220 RRC: Fix direction values
Values were swapped: uplink is 0, downlink is 1.

Change-Id: I30dbb6d89ea832741c3ce4a319be1cb261b1565b
Reviewed-on: https://code.wireshark.org/review/25143
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-06 12:16:25 +00:00
Pascal Quantin ae2e9d669b Diameter: fix retrieval of message flags
Bug introduced in g7ade1695ba

Change-Id: I83e2c2df4f7764130ebe342170f40de5e7610611
Reviewed-on: https://code.wireshark.org/review/25164
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-05 17:12:48 +00:00
Pascal Quantin 82b26b686e NAS EPS: upgrade dissector to v15.1.0
Change-Id: I0ea263b693910c1d8036a18e612c1daf538482dd
Reviewed-on: https://code.wireshark.org/review/25161
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-05 14:16:09 +00:00
Dario Lombardo c0226ea401 ctdb: check return value from wmem_tree_lookup32_array (CID: 1073824).
Change-Id: I0f504ea8ab0608e41566996d380b05ca5d77e3c4
Reviewed-on: https://code.wireshark.org/review/25160
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-05 13:51:12 +00:00
Laszlo Papp ae61319385 OpenFlow 1.5: fix port_stats dissector
Change-Id: Id8f078d9f9c327f3e9c2b50daaf23639cad1ae8f
Reviewed-on: https://code.wireshark.org/review/25157
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 13:36:36 +00:00
AndersBroman d19fa31247 [SBC-AP] Update to 3GPP TS 29.168 V14.2.0 (2017-12)
Change-Id: I84c178c01cfa6d3765d672d6ebbb842e4de55f26
Reviewed-on: https://code.wireshark.org/review/25156
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 12:56:14 +00:00
Stig Bjørlykke fdfa229793 btsmp: Put <none> in COL_INFO when having no keys
Change-Id: If2db9fa1894f586523df882dca224b3b7b0eecb0
Reviewed-on: https://code.wireshark.org/review/25153
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-05 09:47:23 +00:00
Stig Bjørlykke fb9abcf2d4 btatt: Avoid duplicate "Handle:" in COL_INFO
Do not add two "Handle:" in COL_INFO for opcode "Error Response".

Change-Id: I13dd5fc3bbef1762c2e868dfe885fa5d6437412e
Reviewed-on: https://code.wireshark.org/review/25152
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-05 09:18:43 +00:00
Richard Sharpe 4690aa119c ieee1905: Fix a bunch of issues after testing and spec changes.
Change-Id: I8f61ed9866760d13daa0cc65c2a771da3dcf280f
Reviewed-on: https://code.wireshark.org/review/25151
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 08:06:18 +00:00
Laszlo Papp 96cb041ea3 OpenFlow 1.4: fix port_stats dissector
Change-Id: I3ebe1590b9d5fd864746339612ac1396c13196b9
Reviewed-on: https://code.wireshark.org/review/25128
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 05:21:37 +00:00
Alexis La Goutte c29da51613 QUIC: Add Payload (length and data) of PING frame (draft-08)
Bug: 13881
Change-Id: I44a924da6e8da52bdee0f397545d504aee5290bc
Reviewed-on: https://code.wireshark.org/review/25145
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 05:20:07 +00:00
Alexis La Goutte 3a622f9764 QUIC: Dissect Version Negotiation of draft-08
If on Long Header, the version field is set to 0x00000000, it is a version Negotiation Packet
with the list of all supported version (with some GREASE)

Bug: 13881
Change-Id: I56b7cecd112950fb557aadc434f367b74eebe07b
Reviewed-on: https://code.wireshark.org/review/25138
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 05:19:14 +00:00
Alexis La Goutte 58e4910ee7 QUIC: Display Connection in hex on Short Header too
Bug: 13881
Change-Id: Ifc6e4b7be78fe00fce780e002dd77d67f17ebdaf
Reviewed-on: https://code.wireshark.org/review/25137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 05:18:09 +00:00
Alexis La Goutte cc040d88c8 QUIC: Fix Connection ID flag with draft-08
With draft-08 Connection ID is changed to Omit Connection ID in Short Header frame

Bug: 13881
Change-Id: I9e53dc370ea692636143d2129754a3dc62d068bd
Reviewed-on: https://code.wireshark.org/review/25136
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 05:17:23 +00:00
Gerald Combs 6b22e4e85a Add an exit code to make-dissectors.
Explicitly return 0 from make-dissectors on success. Hopefully this will
fix some Windows builder failures.

Change-Id: I0c172597584c52ced2380719135e8559ef83392a
Reviewed-on: https://code.wireshark.org/review/25150
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-05 00:30:59 +00:00
Tom Haynes 0b997f3a3a nfs: Add the second version of the Primary Data NFSv4 file handle dissector
Change-Id: I05da9a546f5de81783e4c9d004aff7dbb3ead44b
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/25146
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-04 23:50:26 +00:00
Anders 7ade1695ba [Diameter] Use proto_tree_add_item_ret..() and proto_tree_add_bitmask_with_flags()
Change-Id: I864a385283aa6975a075f8621d871b73356ecf57
Reviewed-on: https://code.wireshark.org/review/25139
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-04 13:44:40 +00:00
Stig Bjørlykke 5a9edf2a91 btatt: Support BBC micro:bit Bluetooth profile
Change-Id: I32e47e1eef57bb5f8e15e8d83219d6ab034bab73
Reviewed-on: https://code.wireshark.org/review/25135
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-04 12:51:44 +00:00
Dirk Römmen 51d83583c1 bacapp: Add more enumerated values
Ping-Bug: 12457
Change-Id: Ie97747704b12a0ba70bb6adb1a8c251dfcaca08f
Reviewed-on: https://code.wireshark.org/review/25132
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-04 03:43:16 +00:00
Pascal Quantin 8a08237d23 3GPP NAS: upgrade dissector to v15.1.0
Change-Id: Ibfbed335d842e53eabce36e2955a9bb2790d46fb
Reviewed-on: https://code.wireshark.org/review/25131
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-03 20:36:01 +00:00
Stig Bjørlykke e7b50f4751 bthci: Update bthci_cmd_appearance_vals
Change-Id: I385808b95f823a2242844173927cc6abd05c1905
Reviewed-on: https://code.wireshark.org/review/25125
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-03 13:19:43 +00:00
Anders 61c6f1a622 [glib-compat] Include <wsutil/glib-compat.h>
Change-Id: Id505f1dc8dbbeb241162156fc3ef557599a251fb
Reviewed-on: https://code.wireshark.org/review/25123
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:51:56 +00:00
Dario Lombardo c6a065ee7a dcerpc-spoolss: use value_name variable to store string (CID: 1158734).
Change-Id: I30780134b3d8a8e48b8b4997ea27ce82171b4508
Reviewed-on: https://code.wireshark.org/review/25069
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:38:37 +00:00
Anders e3ce3a6f79 [SIP] Use proto_tree_add_item_ret_string() to get the method string.
Change-Id: I8c1933d17a613917c6b6482199949e103c3d1eaf
Reviewed-on: https://code.wireshark.org/review/25112
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:06:55 +00:00
Alexis La Goutte a3857b2f6f QUIC: Enhance *BLOCKED* frame
Add new offset field in BLOCKED and STREAM_BLOCKED frame
Add new stream_id field in STREAM_ID_BLOCKED

Bug: 13881
Change-Id: If030728c46607ea9ea3a500d925b30aaf9a841a8
Reviewed-on: https://code.wireshark.org/review/25121
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:06:40 +00:00
Alexis La Goutte f1c87809de TLS(QUIC): Enhance MAX_STREAM_ID parameter (from draft-08)
MAX_STREAM_ID is rename to MAX_STREAM_ID_BIDI
and there is a new paramter MAX_STREAM_ID_UNI

Bug: 13881
Change-Id: I99bcc559a133ded88f4caedd887f481147063496
Reviewed-on: https://code.wireshark.org/review/25120
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:05:47 +00:00
Alexis La Goutte b10179faf2 TLS(QUIC): Add ACK_delay_exponent parameter from draft-07
Bug: 13881
Change-Id: I56ac681174e4058c4d4fefe40084905538222c1b
Reviewed-on: https://code.wireshark.org/review/25119
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 12:00:39 +00:00
Alexis La Goutte df6b67d54d QUIC(TLS): Fix length of parameter tree
Bug: 13881
Change-Id: I583c9290c5e4d2aaefc2d3ae09babfa82dfbd299
Reviewed-on: https://code.wireshark.org/review/25118
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 11:59:50 +00:00
Anders f71b148edd [BTMESH] Dissect more of Upper transport Layer.
Change-Id: I5d33c64a57689939c9915336701accba8b893415
Reviewed-on: https://code.wireshark.org/review/25115
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 10:10:20 +00:00
Anders 9b4c96334d [NAS-EPS] 5G NAS EPS network feature supported and capability info update.
Change-Id: I243b52e8c448541636f3f94007ee3d850a5811ab
Reviewed-on: https://code.wireshark.org/review/25111
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 13:35:11 +00:00
Robert Grange ea60ed427e packet-mq: Fix after change 25009
Fix for unused variable mq_MQPRI_vals
Fix test when displaying unique MQ Segment (vs multi MQ segment)
Changed my name in AUTHORS

Change-Id: I8ffa5523dbf8469d2814d2a90348eea61a05823a
Reviewed-on: https://code.wireshark.org/review/25106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-02 12:14:40 +00:00
Stig Bjørlykke 3d846aceab btatt: Remove custom UUID dissectors from btatt.handle DecodeAs
Do not add custom UUID dissectors to the DecodeAs "btatt.handle"
table because it does not work to DecodeAs this attributes using
the "BT ATT Handle" field.

This removes some of the artificial protocols which is generated
from BT attributes, and avoids adding new ones when extending
the custom UUID dissection support.

Change-Id: I8384a56b49cac2ea64508470d67c67b6ec7cd13e
Reviewed-on: https://code.wireshark.org/review/25107
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 11:48:11 +00:00
Alexis La Goutte 5bb763a918 QUIC: use varint for all type (draft-08)
Bug: 13881
Change-Id: Ia68659fed9b884bd99de8179e4a320089920df4d
Reviewed-on: https://code.wireshark.org/review/25088
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 09:33:43 +00:00
Stig Bjørlykke 4ac11e0fa1 mq: DEF_VALSB(MQPRI) is still unused
Change-Id: I269c2f367d1d65b006ad881976085dbdf983c407
Reviewed-on: https://code.wireshark.org/review/25105
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-02 08:48:58 +00:00
Stig Bjørlykke 7a2fae2b79 nxp802154: Remove unused code
The IEEE 802.15.4 dissector is built-in and will never be not present,
and if disabled then call_dissector() will call data handle.

Change-Id: Ie8d2a1bed1ba540df1a5bc239b57e475b346c8f1
Reviewed-on: https://code.wireshark.org/review/25103
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 07:41:24 +00:00
Alexis La Goutte d383e34408 QUIC: Add new ACK type (0x0e) of draft-08
Bug: 13881
Change-Id: I7340c6cf2c149cbc547133ea89083c75a5ad05f1
Reviewed-on: https://code.wireshark.org/review/25084
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 07:40:07 +00:00
Alexis La Goutte 8c87af9880 QUIC: Add decrypt Handshake Packet
From/to Server/Client

Store the port destination to found key need to be used

Change-Id: If7f2edcdb21f5b5aa9de28431db8dc3ec6d76602
Reviewed-on: https://code.wireshark.org/review/25083
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:34:23 +00:00
Alexis La Goutte 1a7d65d085 TLS(QUIC): update TransportParameter to draft-08
not longer negotiated version on Client Hello but on encrypted extensions

Missing add new TransportParameterId (ack_delay_exponent and initial_max_stream_id_uni)

Bug: 13881
Change-Id: I5d76662b8c7767c48fdec460e2249d49c6693f18
Reviewed-on: https://code.wireshark.org/review/25018
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:32:55 +00:00
Alexis La Goutte c8c268626c QUIC: Add new STREAM type (0x10 to 0x17) of draft-08
using varint for Stream ID/Offset/Length

Bug: 13881
Change-Id: I9c9524e494e6cb8785d919fee596f94401b12fed
Reviewed-on: https://code.wireshark.org/review/24991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:31:41 +00:00
Alexis La Goutte 0bde3e96f0 Add ENC_VARINT_QUIC
Used to support variable length in QUIC protocol

Bug: 13881
Change-Id: Ia274b1530152376c5fb4e364fc4cf5ab246be1b3
Reviewed-on: https://code.wireshark.org/review/24990
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:29:39 +00:00
Merlin Chlosta af6dee3571 Add columns (_ws.col) to output formats json, ek, pdml
Bug: 13020
Change-Id: Ia83797a4e390be7cc59a9718735edc1c7f9a5712
Reviewed-on: https://code.wireshark.org/review/24928
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:27:51 +00:00
Robert Grange 487eae3507 packet-mq: Improve display of ID Struct + Segmented Msgs
Improve display of ID Struct for FAP Lvl 13
Improve display for Segmented MQ Mesages
Add also the ReasonCode of the ASYNCH_MESSAGE in column and tre node
Added various new CONST for display

Change-Id: I458296e466d0744627e0b4f645d634b0c6d930de
Reviewed-on: https://code.wireshark.org/review/25009
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:26:31 +00:00
Michael Mann 4b7700db4b LNET: Fix gcc 7 compiler complaints
Change-Id: Idad6411139226cb6694b8dad5cb2107882f90848
Reviewed-on: https://code.wireshark.org/review/25102
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 04:28:47 +00:00
Dario Lombardo 9aa42e89c3 dmp: rework build_national_strings() to avoid read/write overrun.
CID: 1417455
CID: 1417459

Change-Id: Idb63e21608825562f61c445309c1b95bb5b3692c
Reviewed-on: https://code.wireshark.org/review/25075
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 21:15:05 +00:00
Uli Heilmeier 404d004907 IPv6: Add segmentation offload (TSO) support
When capturing on hardware with segmentation offload enabled IPv6
payload size can be reported as zero.

This commit adds a preference to dissect such frames.

Heavily based on the TSO code of packet-ip.c

Bug: 14155
Change-Id: Ibec3c35c739d8673fa655bde4f66198a22f567c4
Reviewed-on: https://code.wireshark.org/review/24900
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 21:12:27 +00:00
Alexis La Goutte 3d58a16038 TDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I3345246de63781decc1046834f82f60f02ad54c0
Reviewed-on: https://code.wireshark.org/review/25101
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-01 20:38:40 +00:00
Alexis La Goutte 296f1f35d8 QUIC: fix build when don't have libgcrypt with AEAD (< 1.6.0)
Change-Id: Ic77d12ac07f82ea315734782f97b035376b8b2e8
Reviewed-on: https://code.wireshark.org/review/25099
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-01 20:23:33 +00:00
Lee Mitchell 25a0583ec8 Add dissector for NXP's 802.15.4 sniffer server messages
Change-Id: I360bc4f802e28e9fc64cbd5cc06e514cbaf3b25f
Reviewed-on: https://code.wireshark.org/review/25091
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-01 19:04:19 +00:00
Uli Heilmeier 077124097d ICMP: Resolve Extension Object Class value
Resolve ICMP Extension Object Class value to name as defined at
https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-ext-classes

Ping-Bug: 6632
Change-Id: I73ce9dbef5b09aa49f16c73a04ce474cd46f5695
Reviewed-on: https://code.wireshark.org/review/25098
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 17:42:26 +00:00
Graham Bloice 9b5e568023 nfapi: Fix spurious checkAPI warnings
Uppercase a lot of "index" words in strings to quieten checkAPI.
Removed some redundant double spaces.

Change-Id: Ica5915095037ec3da1d7c92d05c3a4d155bb302c
Reviewed-on: https://code.wireshark.org/review/25092
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 20:02:36 +00:00
Graham Bloice 1fa22c2ee9 btmesh: replace\convert g_warning
Replace g_warning with ws_g_warning, add expert info.

Change-Id: I54ae5959f89ee85bdd821f07af8cf4ec3172748e
Reviewed-on: https://code.wireshark.org/review/25090
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 18:15:43 +00:00
Graham Bloice 3c35f278b9 nfapi: fix typo, correct expert info message
assignmnet => assignment
update message to show its the length value in error

Change-Id: Ic320dafb00d4e6ceb7b3b7addaf2bff25739851f
Reviewed-on: https://code.wireshark.org/review/25089
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 16:41:09 +00:00
Graham Bloice b9210c72f5 DNP3: Add support for new Group 0 variations
Add support for new objects g0v196-210
Rework handling of g0 objects

Change-Id: I64c46cf4709799711a7cc6ca77fe356e47dced62
Reviewed-on: https://code.wireshark.org/review/25086
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 16:02:12 +00:00
Alexis La Goutte a8088cce88 QUIC: Add decrypt of Initial Packet
Missing Handshake and need to fix dissection of payload with varint change...

Bug: 13881
Change-Id: Ib8fb6321436d72c8c4dba172dd43ef31288615d9
Reviewed-on: https://code.wireshark.org/review/24962
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-31 14:28:33 +00:00
Nathaniel Clark 1fcc10c17e [lnet] Initial Lustre Network Support
Add Lustre Networking layer LNET.

Change-Id: I36eb9eac7e0f5e40dece0ef2ad7c038fab10e192
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24795
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-31 14:26:49 +00:00
Gerald Combs f930710585 [Automatic update for 2017-12-31]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I38b0274b93baf3e2d307827f04960f4bf7407842
Reviewed-on: https://code.wireshark.org/review/25080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-31 08:16:15 +00:00
Kenneth Soerensen 5daead33ae ZigBee: Add remaining attributes from Smart Energy Price cluster
Change-Id: I365e40d1e0c287ecfcee30fb72538d360926b827
Reviewed-on: https://code.wireshark.org/review/25068
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-30 12:40:34 +00:00
Thomas Chen 3b4aabe818 websocket: All decompressed payloads are same when more than one compressed data payload in a TCP PDU.
Change-Id: Ie31721a34518dd87a99621ea6f0234f2cd7d9e85
Reviewed-on: https://code.wireshark.org/review/25066
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-30 07:27:04 +00:00
Thomas Chen 998507d327 proto_data.c: Fix bug in p_remove_proto_data.
Change-Id: I44654b1aa6f513a0bccb88cba3181f5c52073832
Reviewed-on: https://code.wireshark.org/review/25065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-30 07:25:56 +00:00
Alexis La Goutte ea8d0c51b3 proto(.h): fix indent (align...)
Change-Id: Ie3f41b76719a5e91c27b5ae2805f23cd26f1fa11
Reviewed-on: https://code.wireshark.org/review/25059
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 20:39:33 +00:00
Dario Lombardo 0b124bff9b cip: initialize variable (CID: 1403067).
Change-Id: I65c1b59f8dd6adb471872b74ec9963066053ec66
Reviewed-on: https://code.wireshark.org/review/25071
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 20:26:31 +00:00
Dirk Römmen 0c4a307ee5 Corrected gcc-7 compilation warning "implicit fallthrough" in BACnet dissector.
Change-Id: I28c1d2b811209f9e3e606244cf420356af1ddecf
Reviewed-on: https://code.wireshark.org/review/25060
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:15:48 +00:00
Jakub Zawadzki f31e9b3154 Use gcry_strerror() to get crypt error description.
It seems using gcry_strerror() should be correct,
it also fix building when --without-gnutls (when -lgpg-error is not added):
  /usr/bin/ld: epan/.libs/libwireshark.a(packet-ipsec.o): undefined reference to symbol 'gpg_strerror@@GPG_ERROR_1.0'

Change-Id: I142e2e553fd7da501bd57635b8826ff42e114085
Reviewed-on: https://code.wireshark.org/review/25064
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:14:59 +00:00
Alexis La Goutte 95bb65ff25 QUIC: Initial draft-08 support
Add new Long and Short Packet type
Set version field before packet number

Bug: 13881
Change-Id: I894bc5ada0d5d0269c8d12749533eaa07c553635
Reviewed-on: https://code.wireshark.org/review/24961
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:12:27 +00:00
Stig Bjørlykke b60a60717f btatt: Skip Units and Members UUIDs in decode-as
Change-Id: I926c2abdfb6620236fabd6ae5aa1aa35d1fa79d2
Reviewed-on: https://code.wireshark.org/review/25050
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 07:53:47 +00:00
Stig Bjørlykke c693522e33 bluetooth: Update Assigned Numbers
Change-Id: I1565d8fa8983c36a6efe6ffbdb97b1e874632891
Reviewed-on: https://code.wireshark.org/review/25049
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-29 06:13:03 +00:00
Dario Lombardo 26222c96bb nvme-rdma: check return value of find_conversation() (CID: 1398218).
Change-Id: I091471cbc59170f21f55aee0b29f1733f269cd05
Reviewed-on: https://code.wireshark.org/review/25042
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 01:41:49 +00:00
Dario Lombardo fb8b28005f amqp: check return value of conversation_get_proto_data().
CID: 1325720.
CID: 1325721.

Change-Id: Ia781c70a3580fbd534b470664451e4838948dce4
Reviewed-on: https://code.wireshark.org/review/25045
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 01:34:29 +00:00
Pascal Quantin 456c3ff4a3 3GPP NAS: upgrade dissector to v14.6.0
Change-Id: If8d0ab933285f8398b0e8625e7c6e2ef0345fc95
Reviewed-on: https://code.wireshark.org/review/25040
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-28 19:07:59 +00:00
Dario Lombardo 02f7c44469 rtps: remove unused ei entry.
Change-Id: I3bb1470e6c5225a431bc49de9e6032e2016a1824
Reviewed-on: https://code.wireshark.org/review/25020
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 15:30:43 +00:00
Dirk Römmen 6aa3502306 Enhanced BACnet dissectors supporting BACnet revision 19.
Bug: 12448
Bug: 12453
Bug: 12457
Change-Id: Ia8ed69ae1014f01ae246b31f6bb5aaedfc4656d2
Reviewed-on: https://code.wireshark.org/review/25010
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 11:31:48 +00:00
Dario Lombardo 538f0883f7 dcerpc-spoolss: remove unneeded check (CID: 1158734).
Change-Id: Ie4f827835b9d59838d90d00e57f729c6a8004b19
Reviewed-on: https://code.wireshark.org/review/25015
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:30:19 +00:00
Dario Lombardo 9b9f3098ac rtps: remove unneeded check (CID: 1158869).
Change-Id: Ib9b2902c56fb569366e62a1d85b173862d29e61f
Reviewed-on: https://code.wireshark.org/review/25019
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:29:29 +00:00
Uli Heilmeier ccc931b0a7 Netflow: Updated IEs (RFC8038, RFC8158, et al.)
Updated InformationElements as defined at
https://www.iana.org/assignments/ipfix/ipfix.xhtml

Includes updates for RFC8038 and RFC8158.

Change-Id: I66411428d0faee4290b5134b1c31c84b49996f2e
Reviewed-on: https://code.wireshark.org/review/25013
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:22:14 +00:00
Martin Kaiser bdccb597fe ltp: don't assign a gint64 value to a guint64 variable
evaluate_sdnv_64() returns gint64 and does indeed return -1 for errors.
Use a gint64 variable to hold the return value, cast to guint64 if necessary.

Change-Id: I2aa6f95302cf20f758a872c00c3d49857f2faea4
Reviewed-on: https://code.wireshark.org/review/24989
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:36:15 +00:00
Dario Lombardo a094154abe scsi-smc: remove dead code (CID: 1159071).
Change-Id: I1ecee4343b46da01ec60a8db76f19ca4c1996b34
Reviewed-on: https://code.wireshark.org/review/25022
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:29:11 +00:00
Dario Lombardo 3a2773c9ef nlsp: remove logically dead code (CID: 1158979).
Change-Id: I2a6c6bb78a165f7fbc3864c4b721c0bf9064d12b
Reviewed-on: https://code.wireshark.org/review/25021
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:27:54 +00:00
Krishnamurthy Mayya 4b1bd4742c LTP : Header and Trailer extension Corrections.
This patchset involves the changes done to decode header and trailer
extensions correctly. There were places where the frame offset was
not handled properly leading to the improper decoding of the subsequent
fields.

Also, the subtree name for Trailer extension was not proper.

Change-Id: Ia38ddddbcd83435ce8aaa73791a2f5a14918b48f
Reviewed-on: https://code.wireshark.org/review/24140
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-27 08:11:14 +00:00