aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-13nordic_ble: Fix delta time start-to-start calculationStig Bjørlykke1-80/+199
The on-air time for a packet was calculated wrong because it was using the wrong number of on-air bytes. This has been corrected. Calculating delta time start-to-start for BLE 4.2 requires support for on-air packet size up to 255 bytes (LE Data Length Extensions). For this the payload length size in the header has changed to two bytes. Calculating delta time start-to-start for BLE 5.0 needs physical layer data rate (LE 1M PHY or LE 2M PHY). For this the flags was extended with PHY values. Removed superfluous min and max length checks. Change-Id: I40bef14f0c19ee77a402efc76e5d01826e63e603 Reviewed-on: https://code.wireshark.org/review/26457 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-13GSM BSSMAP: fix a typo in in speech version range_stringPascal Quantin1-5/+5
Bug: 14528 Change-Id: Ie49317f264f08052a9e8a33dffeb9751add463d4 Reviewed-on: https://code.wireshark.org/review/26458 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-13Column format functions must not be called with a NULL format string.Joerg Mayer1-3/+5
Fix two compile time warnings while at it. Change-Id: I4e1539bec9a5b5092acde221e1d434dbd325ab42 Reviewed-on: https://code.wireshark.org/review/26453 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-13TDS: Improve dissection of TDS5 tokenized requests.Craig Jackson1-656/+1160
Add dissection of more tokens in the TDS5 tokenized request packet. These include RPC calls and parameterized language calls. The majority of the remaining tokens are associated with cursors. Cursors are a large enough problem to merit a separate patch. Change-Id: I5bdf33cd167178c2bc6027a5434740d70ef50744 Reviewed-on: https://code.wireshark.org/review/26455 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-13CMake: Skip some header checks on Windows.Gerald Combs2-1/+29
Skip some header checks on Windows when we're sure they will always be true. Change-Id: I4ff7c867b9268a53692085553055dcbc0f90ae1d Reviewed-on: https://code.wireshark.org/review/26452 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-03-13CMake: Exclude wmem_test from the default buildGerald Combs1-0/+1
Exclude wmem_test from the default Wireshark.sln build similar to our other test programs. Change-Id: If9a16944823bb3a928260c5e1307870253f1da8f Reviewed-on: https://code.wireshark.org/review/26456 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-03-12Remove some unused or hard-coded header checks.Gerald Combs7-140/+3
Remove some unused checks and code found using grep -o 'HAVE_[A-Z0-9_]*' ConfigureChecks.cmake | sort -u \ | while read have_h ; do echo = $have_h ; git --no-pager grep -cl $have_h ; done Change-Id: I86bfcfdc4f60d9d7de87017a7bb00f833a79bd2c Reviewed-on: https://code.wireshark.org/review/26451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-12Qt: Implement MulticastStatisticsDialog::treeItemDataGerald Combs2-0/+12
Implement MulticastStatisticsDialog::treeItemData so that the "Copy" button works. Bug: 14477 Change-Id: I8e7ff2a41b0f14e600b0781c3a01e03270c26ae7 Reviewed-on: https://code.wireshark.org/review/26430 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-12TLS13: prepare for early data trial decryptionPeter Wu3-37/+68
Extract code for reuse with early data decryption. No functional change. Change-Id: I0df1a12a9780a8cfba951e9944ce9665a4b70f7a Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/26444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-12Add dissector for Nano / RaiBlocks cryptocurrency protocolRoland Haenel4-0/+501
Change-Id: I34f610a19a972db1c08d7896453e5ed671ec4dc6 Reviewed-on: https://code.wireshark.org/review/26394 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>
2018-03-12ber/per: assert actx to avoid null dereference (found by clang).Dario Lombardo2-0/+4
Change-Id: I4efc6d30060bf8842d5facdd3151385b805fe22b Reviewed-on: https://code.wireshark.org/review/26136 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-12eth: fix null pointer dereference when called from LuaPeter Wu1-2/+3
At the moment, Lua dissectors always pass a NULL data parameter, so dissectors like eth should gracefully handle that. Bug: 14293 Change-Id: Ida4d0530a9c417db5960475274315d4acc3704a8 Fixes: v2.1.0rc0-1575-g8ec153f938 ("Have the "maybe an FCS" version of the Ethernet dissector take a data argument.") Reviewed-on: https://code.wireshark.org/review/26431 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-11F5ETHTRAILER: Initial cleanup from submissionMichael Mann2-664/+492
The dissector had been a plugin since at least 1.3 (based on comments in the dissector). Not all of the most current APIs were used for functionality and there was some cruft left over. Also disable F5ETHTRAILER by default since it doesn't have a discriminating heuristic. Change-Id: I8c977167a906eafd6fbb663d2fe6c44f080f2209 Reviewed-on: https://code.wireshark.org/review/26428 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11Add wmem alloc parameter to ws_find_media_type_parameter.Michael Mann4-32/+14
All current uses of ws_find_media_type_parameter need wmem_packet_scope(), but there is no sense in limiting what other dissectors may want to do. Change-Id: I35b0dd2a024a0ae0a8345577dd92a1a21ddd2cc4 Reviewed-on: https://code.wireshark.org/review/26427 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11Adapt to current WS code base to make it compile and run without warnings or ↵Joerg Mayer7-446/+287
errors Change-Id: I135df8b0e49346e32a19620d52cd1a9a44b4ac08 Reviewed-on: https://code.wireshark.org/review/26426 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-11Resolve the F5PROTO_TREE_ADD... macros: They render our check-scripts ↵Joerg Mayer1-66/+115
ineffective. Change-Id: Iea46eb7d20702ee07e13f75469014d468f36ad85 Reviewed-on: https://code.wireshark.org/review/26425 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-11Import f5 Wireshark plugin for the f5 ethernet trailerJoerg Mayer3-0/+3215
Version 1.11 for WS 2.4 from https://devcentral.f5.com/d/wireshark-plugin (login required). Change-Id: I00872793061ff23bce41fe71b2ae6c31f064bafd Reviewed-on: https://code.wireshark.org/review/26424 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-11[Automatic update for 2018-03-11]Gerald Combs11-120/+115
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iac7e2b50ed60639dde90946632811753288110d6 Reviewed-on: https://code.wireshark.org/review/26421 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-11IEEE 802.15.4: show MIC and key number for decryptionRobert Sauter1-21/+21
- show the MIC of the received packet - show only payload (without) MIC as data when decryption failed - show key number (UAT row index) used for decryption - small cleanups Change-Id: I7815349e99b178c219a0e649d3d65f0b6eaa7201 Reviewed-on: https://code.wireshark.org/review/26362 Reviewed-by: Ed Beroset <beroset@ieee.org> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-11DOF: restore correct memory scope for decrypted bufferPascal Quantin1-1/+2
Change-Id: I143f73f7921187bac5de46cd07344b015a06a578 Reviewed-on: https://code.wireshark.org/review/26420 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-11tfs: Add high_normal and low_normalRobert Sauter4-5/+6
Change-Id: Ie56e3546fc1bc5da61f95456e15544a2880c819d Reviewed-on: https://code.wireshark.org/review/26418 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11maxmind: check val_start before using it.Dario Lombardo1-4/+4
Change-Id: Id3ee8e8d4c54c02d68048ec677fdda599b329713 Reviewed-on: https://code.wireshark.org/review/26417 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-11maxmind: use ws_strtou32 to convert AS numbers.Dario Lombardo2-4/+8
Change-Id: I0578f8a674feee6e4763d5481a2285b7b2a054dc Reviewed-on: https://code.wireshark.org/review/26416 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-11gryphon: fix 'gryphon.usdt.action_flags' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_BOOLEAN and FT_UINT8 Change-Id: Id273b1f80728042122b6bfa3053d263b25f6bdbe Reviewed-on: https://code.wireshark.org/review/26412 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-10ENIP packets are not decoded as ENIP anymoreDylan Ulis1-0/+9
The length check in dissect_enip_tcp() was previously removed but it's necessary to filter out one byte messages that are mostly likely TCP keep alives. Bug: 14434 Change-Id: I44c10aaf0a2e06870ad82f87aab9d72548b77f9f Reviewed-on: https://code.wireshark.org/review/25807 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-10MaxMindDB: Add country ISO codes.Gerald Combs4-3/+59
Add and dissect country ISO codes. Prefer them when printing summary information. Change-Id: I3ce2bde88fa5ca2604c8bb745c42f239660252ff Reviewed-on: https://code.wireshark.org/review/26415 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-10MaxMind DB: Fixup IPv6 address interning.Gerald Combs1-2/+7
Intern IPv6 addresses into their own hash table. Change-Id: I1ad60bf56585fcd89964e949e8754af3c7512a75 Reviewed-on: https://code.wireshark.org/review/26414 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-10Process MaxMind DB data one line at a time.Gerald Combs1-77/+74
Use fgets instead of ws_read + g_strsplit. Change-Id: I9d13183cc129e0c749742779f9c48fdfba21a8fc Reviewed-on: https://code.wireshark.org/review/26374 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-10Add tfs_activated_deactivatedPascal Quantin3-14/+10
Change-Id: I383ee93ec2a06ed2c2d07b702436035566591348 Reviewed-on: https://code.wireshark.org/review/26413 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-10Don't put a comma after the last item in an enum list.Guy Harris1-1/+1
C prior to C99 and C++ prior to C++11 don't allow a comma there; we require C99, at least on UN*X, but don't require C++11. Change-Id: Ia652de44315d4d87e75f583317b7b1069c8804e7 Reviewed-on: https://code.wireshark.org/review/26411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-10Avoid the realloc() warning from VS Code Analyzer.Guy Harris1-3/+5
It's not just worrying about the lack of a check for a null return, it's worried about the leak. Assign the result to a different variable and, if the result is null, free the old data before exiting, and if it's not null, assign the new variable to the one we're using as a pointer to the array. Change-Id: Ia1d5d271293e13708c35a7562a1f40671304c417 Reviewed-on: https://code.wireshark.org/review/26410 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09Add ws_pipe_kill_child_on_exit.Gerald Combs1-3/+55
Add ws_pipe_kill_child_on_exit, which associates a child process handle with a job object that has the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag set. Call it when we create a process in ws_pipe_spawn_sync and ws_pipe_spawn_async. Note that we might want to use it elsewhere. Change-Id: Ia0f6863ea4df0ab8623bb923a49da7776d83bd33 Reviewed-on: https://code.wireshark.org/review/26398 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09Regenerate dissector from updated template.Guy Harris1-1/+1
Change-Id: I929cc88942548b537b2faeb641d582c1dcb2ed27 Reviewed-on: https://code.wireshark.org/review/26406 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09Regenerate dissector.Guy Harris1-5/+5
Change-Id: I87888e6c7cca4be4d973134be05581fb1cddbbe8 Reviewed-on: https://code.wireshark.org/review/26405 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09Put a variable inside the block in which it's used.Guy Harris1-1/+1
Change-Id: I8fcd694924458c124b43734fe5ded42cdf2d0174 Reviewed-on: https://code.wireshark.org/review/26404 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09kerberos: remove leak (found by clang).Dario Lombardo2-15/+19
Change-Id: I70242960466b276cf9ffb62fda62dcb40c17c1fe Reviewed-on: https://code.wireshark.org/review/26396 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09entry_data.type is unsigned, so print it with %u.Guy Harris1-1/+1
This should squelch a warning from VS Code Analyzer. Change-Id: I69e528c3dfd851d287b1faebc1469cd700fa9ef5 Reviewed-on: https://code.wireshark.org/review/26402 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09Check for realloc() failing.Guy Harris1-0/+4
Unlikely, but not impossible, and should squelch a VS Code Analyzer warning. Change-Id: I399c08896a3f08962ca46483d47ba5f6cbe4f28e Reviewed-on: https://code.wireshark.org/review/26400 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09spdx: use consistent formatting for GPL-2.0-or-laterPeter Wu6-6/+6
Change-Id: If8ffe67f6b624d7f1bcaa278a146e41247720226 Reviewed-on: https://code.wireshark.org/review/26393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-09maxminf_db.c: ad an explicit cast to please gcc 7.3.1Pascal Quantin1-1/+1
Change-Id: Ie97008ece77e485948a3a8d418a49b77c1a52a33 Reviewed-on: https://code.wireshark.org/review/26395 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-09mmdbresolve: remove leak (found by clang).Dario Lombardo1-0/+2
Change-Id: I7de7707d75c80bc12ec2c4a30a19f6988932b0b7 Reviewed-on: https://code.wireshark.org/review/26392 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09GeoIP: avoid closing random file descriptorsPeter Wu2-6/+27
Previously there were three different pipe validity checks: PID != WS_INVALID_PID, PID != 0 and stdin != 0. This resulted in using/closing file descriptors which might be owned by something else. When no GeoIP databases are defined, mmdb_resolve_stop would be called to close the pipe and set PID to WS_INVALID_PID. stdin is however not cleared and future invocations would try to close the previous fd. Change-Id: I1d15da29208efb41098ee6a4edeeabf61f84c2b3 Fixes: v2.5.1rc0-466-ga1da75c554 ("Transition from GeoIP Legacy to MaxMindDB.") Reviewed-on: https://code.wireshark.org/review/26391 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09IEEE 802.15.4: fix wmem_free instead of g_free; fix outdated commentsRobert Sauter1-12/+3
Change-Id: Idfb2b5a9d6fd1c571a5a9edeb91e7f9281a06df0 Reviewed-on: https://code.wireshark.org/review/26363 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09QUIC: Replace cleartext by handshakeAlexis La Goutte1-21/+21
from draft-08 (07 ?) it is now handshake secret (and no cleartext secret) Bug: 13881 Change-Id: I03983c13f0c37839e1a41b6beb20f6e133adc8f8 Reviewed-on: https://code.wireshark.org/review/26390 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-09QUIC: Remove last long packet type about old draft (< 08)Alexis La Goutte1-6/+0
Bug: 13881 Change-Id: I9fae21b62b7394a8ae52c5fa551aea2da17fbff5 Reviewed-on: https://code.wireshark.org/review/26389 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-09WSP: check tvb_get_guintvar() successPascal Quantin1-1/+3
4630b4fcf8 sets octetCount to 0 in case of error. Let's check this return value to avoid an infinite loop Bug: 14519 Change-Id: Ie3519067d609afb1bbf9e67f7f15f95911d2b173 Reviewed-on: https://code.wireshark.org/review/26388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Register and initialize the ZCL clusters in a uniform way.Paul Zander11-415/+162
The cluster registration and initialisation is done in the functions 'proto_reg_handoff_zbee_zcl_XXX'. In these functions the 1st step was to register the dissector. Then the cluster was initialised via the function 'zbee_zcl_init_cluster'. In this patch the registration and initialisation is now done by the function 'zbee_zcl_init_cluster'. In this way we have a more uniform way of registration. Change-Id: If865d904ea51c299a48e5c0004f3f280b7479d49 Reviewed-on: https://code.wireshark.org/review/26325 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-09spdx: convert files with multiple licenses.Dario Lombardo13-329/+13
Change-Id: Iac29428b5a6d26896e559f06acf202f03fa8ec90 Reviewed-on: https://code.wireshark.org/review/26366 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09licensecheck: handle multiple licenses.Dario Lombardo1-1/+13
Change-Id: I1df4406e4bfcdcea99dc1c1446f1863c0a4522a0 Reviewed-on: https://code.wireshark.org/review/26386 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09SIP: Add a filter for icid-value.AndersBroman1-0/+133
Change-Id: If049f0a86999ddaa23d4ad9ec8f6a4679c7623e2 Reviewed-on: https://code.wireshark.org/review/26387 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 06:07:23 +0000