aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-02-02ui: use SPDX identifiers.Dario Lombardo79-1110/+79
Change-Id: I6b05399395bcc35e59b73b4030ba4a05711a7b1a Reviewed-on: https://code.wireshark.org/review/25565 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02fuzzshark: use SPDX identifier.Dario Lombardo1-14/+1
Change-Id: I9c786b8bbb96a4bfa1560536c3929b844aa8afb7 Reviewed-on: https://code.wireshark.org/review/25562 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02randpkt_core: use SPDX identifiers.Dario Lombardo2-28/+2
Change-Id: I3b8bb17c0c679533cc5281aaf18881e859fe7cf6 Reviewed-on: https://code.wireshark.org/review/25561 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02codex: use SPDX identifiers.Dario Lombardo15-210/+15
Change-Id: I02f43e660484e9c0ebce96b42dbdd7b4229a1198 Reviewed-on: https://code.wireshark.org/review/25560 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-02Qt: Add a missing HAVE_LUA guardStig Bjørlykke1-0/+2
Change-Id: I0ee67e769c2c9030da1844a6631dac9a494d0f06 Reviewed-on: https://code.wireshark.org/review/25556 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-02Qt: add initializers in PacketDialog() (CID: 1427679).Dario Lombardo1-0/+8
Change-Id: Id2f16d849b85275308101f49a5ea22fbddf66f3b Reviewed-on: https://code.wireshark.org/review/25411 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-02packet-mq: Add support for IMS+TM StructDario Lombardo4-717/+891
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-02Qt: Fix splash screen "Registering dissectors" messageStig Bjørlykke1-2/+2
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-02SoupBinTCP: Remove try_conversation_dissector callMichael Mann1-16/+0
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-02Qt: Always update splash screen on action changeStig Bjørlykke1-4/+7
On a "fast" computer this is needed to find any action which is taking long time during startup. Without this the splash screen may show a random action message happening before the slow action. Also optimize splashUpdate() when nothing to update. Change-Id: I0946353dbcf12e78323361f2cb4410c6c5605d76 Reviewed-on: https://code.wireshark.org/review/25552 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-02Note that /guard:cf requires CMake 3.9 or newer.Gerald Combs1-0/+2
Change-Id: I775daafdba012deb2eac5cf8d895be55243d9440 Reviewed-on: https://code.wireshark.org/review/25554 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-01Fix memleak in color_filters_read_globals()Jakub Zawadzki1-0/+1
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-01RTP: ensure that bta2dp_info and btvdp_info are always initializedPascal Quantin1-2/+5
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-01Fix endianness of CAN-ETH CAN packetLazar Sumar1-2/+1
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-01Qt: Show Lua scripts as links in the about box.Gerald Combs4-16/+49
Add UrlLinkDelegate::setColCheck, which lets you render strings as URLs or plain text according to a regex. Use it to show Lua scripts as URLs in the about box. Open links on double clicks and add column checks. Change-Id: Iaf5cd8a46a0b66a7d45079ba045ed2bbcb0ed005 Reviewed-on: https://code.wireshark.org/review/25542 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-01oss-fuzzshark: try to fix oss-fuzz assert fails.Jakub Zawadzki1-5/+10
Change-Id: Ic4ff70dfc55b2694f761cdadcac1962242fca753 Reviewed-on: https://code.wireshark.org/review/25551 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-01base64: Adjust whitespace for readabilityStig Bjørlykke1-10/+10
Change-Id: Ibf72dddceac925521a0fec3ab0bed7ed360e7c06 Reviewed-on: https://code.wireshark.org/review/25547 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01json: Adjust whitespaceStig Bjørlykke1-11/+9
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-01Qt: Always show the Plugins tab in the about box.Gerald Combs2-6/+18
Always show the Plugins tab. We probably have plugins via extcap even if Lua and dissector plugins are disabled. Tell the user if we don't find any plugins. Change-Id: I7ab1fb302298232a847193754b53688620855959 Reviewed-on: https://code.wireshark.org/review/25543 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-01Qt: More byte view and proto tree fixes.Gerald Combs3-46/+75
47e1798762 broke byte view highlighting when selecting a proto tree item. Switch back to emitting fieldSelected from selectionChanged. Force a new selection in selectedFieldChanged, which does what we were trying to do in 47e1798762. Clear our marked byte offset in the byte view when we mark a field. Emit byteSelected whenever we click the mouse. Don't highlight anything when a tree item is deselected. Deselect a tree item if we click on something that's not a byte in the byte view. Change-Id: Ibf419ccb005d69f733b2fe12ce674e1fe504bb96 Reviewed-on: https://code.wireshark.org/review/25541 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-02-01buffer: add g_assert to all functions.Dario Lombardo1-0/+11
This pacify clang warnings as well. Change-Id: I5d61a82bfc43b93281f0d0caabcb7109c849788b Reviewed-on: https://code.wireshark.org/review/25518 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-01oss-fuzzshark: test code to debug some oss-fuzz assert fails.Jakub Zawadzki1-0/+5
Change-Id: I5dbe899ca8a4f9107d62667ca107a4d3a48fe51b Reviewed-on: https://code.wireshark.org/review/25545 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-01TDS: ensure to always initialize tds_encoding_char even when protocol is unknownPascal Quantin1-17/+3
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-01Qt: Avoid a potentially large memdup.Gerald Combs1-2/+4
Use QByteArray::fromRawData + tvb_get_ptr to create our ByteViewText data instead of tvb_memdup. If our tvb lifetime is shorter than our ByteViewText lifetime then that's a bug. Change-Id: Iede275578a1493b8658308e0778f7f0799d6c6cd Reviewed-on: https://code.wireshark.org/review/25534 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-02-01New dissector Session Multiplex Protocol SMPUli Heilmeier5-7/+303
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-01bacapp: make sure to NUL terminate bf_arr.Jakub Zawadzki1-3/+3
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-01-31ieee80211: various fixes to the 802.11ax support.Adrian Granados1-59/+57
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-31IAX2: always initialize src_vformat and dst_vformatPascal Quantin1-0/+2
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[MEGACO] Clear megaco_command between commands.AndersBroman1-0/+1
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-31hsrp: Fix UDP port number for HSRPv6Stig Bjørlykke1-1/+1
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-31Qt: fix compilation when building without LuaPascal Quantin2-0/+6
Change-Id: Idb5d1016637c5d8968eae533d7688099edbeae3a Reviewed-on: https://code.wireshark.org/review/25525 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-31Qt: About dialog updates.Gerald Combs9-93/+88
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-31Qt: Byte view and proto tree fixes.Gerald Combs2-45/+26
Select our byte field only when we enter marked / locked mode. Emit fieldSelected from autoScrollTo so that we always set the marked protocol. Don't clobber the current index in saveSelectedField. Change-Id: I967b20608f991a5f3e6a0979b1f702f874ce27b4 Reviewed-on: https://code.wireshark.org/review/25521 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-31Qt: Write recent before applying profile changesStig Bjørlykke3-2/+16
The selected profile may be renamed in apply_profile_changes() so write the recent file before renaming the directory to ensure that we reload the latest changes. Change-Id: I8988a00647926d93b0a1903090aadc8c61f1a34e Reviewed-on: https://code.wireshark.org/review/25516 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-31UI: Rename profiles without deleteStig Bjørlykke1-3/+3
Do not try to delete the old profile name after renaming. In most cases it will not exist, but when using a case-insensitive file system this will delete the renamed profile if only changing capitalizations (first it's renamed and then it's deleted). Change-Id: I27d2d22d2353b09f2041d82ea1cf1bae37a1ce3d Reviewed-on: https://code.wireshark.org/review/25515 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-31IO Graph: Add some vector checks.Gerald Combs1-3/+3
Use Qvector::value in a few places instead of an array index. Change-Id: I821ef4b16df919977739c12ccaa3b9c3d53f049c Ping-bug: 14357 Reviewed-on: https://code.wireshark.org/review/25511 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-30ieee1905: add missing NULL terminatator to ieee1905_reporting_policy_flags[].Jakub Zawadzki1-1/+2
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-30Qt: Fix crash when no plugins are configuredJaap Keuter2-3/+3
Configuring Wireshark with Cmake using -DENABLE_LUA:BOOL=OFF and -DENABLE_PLUGINS:BOOL=OFF causes all plugin support to be removed. The about Wireshark dialog wasn't made aware of that trying to manipulate the related mdoel anyway, causing a crash. Make the compilation of the offending code conditional. Change-Id: Ifa51f40fda7f019d09327dc5650e5a55da2daf2a Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25517 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-01-30Remove more unused images.Gerald Combs13-5846/+0
We stopped using various images in the following commits: 307c0d70fb (2011, not sure how they lasted that long) clist_*.xpm 20cc0d7ce9 (2010) stock_dialog_error_48.xpm stock_dialog_info_48.xpm stock_dialog_warning_48.xpm stock_dialog_stop_48.xpm 2e4e229739 (2004) stock_dialog_question_48.xpm 1a3e596609 (2011) voip_select.xpm 194a145c8f (2013) wssplash*.xpm 07c3d057b8 (2013) openhand-16.png rubberband-16.png Change-Id: I3647cb2cb47e3927a4359f519ce45eb57e5aa534 Reviewed-on: https://code.wireshark.org/review/25519 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-30Qt: Check for a valid capture file in the status bar.Gerald Combs1-49/+54
Rearrange the logic in showCaptureStatistics. Fixes a crash here when capturing from stdin. Change-Id: I7ec15a556579afe968a06a36d7914aa1631666df Reviewed-on: https://code.wireshark.org/review/25507 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-30radiotap: Refactor some aspects of the radiotap dissector.Richard Sharpe1-448/+514
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-30SIP: Fixed matching of INVITE request to INVITE response.Robert Jongbloed1-7/+7
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-30Byte view: Mark bytes using an outline.Gerald Combs4-31/+11
Distinguish between hovered and marked bytes using a lighter and heavier outline. Remove the "mark" color definitions. Change-Id: Icf6363e920a634574b7a42a10ea77b538ce78290 Reviewed-on: https://code.wireshark.org/review/25513 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30ieee802154: Allow generic nonce to be passed in CCM* API.Mališa Vučinić3-23/+29
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-30wiretap/merge.c: Fix memory leak, fix description.Jakub Zawadzki1-4/+7
If merge_open_in_files() is going to fail, free files array to avoid memleak. Found by clang. Change-Id: I156c5f1c041cd7779ff0a0095bc2810f50768ab6 Reviewed-on: https://code.wireshark.org/review/25421 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30file.c: Fix read from array index out of bounds.Jakub Zawadzki1-1/+1
callback_args.col_widths[] is allocated only for visible columns, use 'visible_col_count' index instead of 'i' one, which is incremented only for visible columns. Found by clang. Change-Id: I4e3c05fd372585295e3a0d7427497a46f32f93bb Reviewed-on: https://code.wireshark.org/review/25444 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30New RTCP dissector for transport-ccZHANG Rui1-2/+359
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-30usbdump: Add usbdump wiretap plugin as functional exampleJaap Keuter10-1/+485
This wiretap plugin serves a dual purpose. One is to add usbdump file reading capability to wiretap and therefore Wireshark and Tshark. Second it is an illustration of a basic wiretap plugin module. Change-Id: Iefbb156ea1bc5d90dabc1753942cdb9e393714ad Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25487 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30SDP/RTP: Support for "bundled" media.Robert Jongbloed5-32/+86
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-30wifi-dpp: A number of further changes from the recent testing.Richard Sharpe1-6/+33
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 05:38:37 +0000