aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2018-03-13Remove popcount in favor of ws_count_ones.Gerald Combs3-31/+30
Remove our popcount implementation in favor of ws_count_ones, which is our other popcount implementation. This required updating and running process-x11-xcb.pl. Change-Id: I8634c55242113b338c5b0173837c35f98b148b4f Reviewed-on: https://code.wireshark.org/review/26454 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-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: 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-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 Haenel3-0/+500
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 Mann1-661/+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 Mayer5-446/+283
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-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-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-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-09spdx: use consistent formatting for GPL-2.0-or-laterPeter Wu2-2/+2
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-09GeoIP: avoid closing random file descriptorsPeter Wu1-6/+19
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-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>
2018-03-09Add MaxMindDB 1.3.2 library to WindowsPascal Quantin1-2/+2
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-09LACP: protect a possible infinite loopPascal Quantin1-1/+1
Offset should not go backwards. Bug: 14518 Change-Id: I03a64ae9a99f1ca095f0bc710f93f0f6ba2248e6 Reviewed-on: https://code.wireshark.org/review/26384 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-09spdx: more licenses converted.Dario Lombardo7-137/+7
Change-Id: I8f6693108c43959e54911d35b4fbf730c59add60 Reviewed-on: https://code.wireshark.org/review/26361 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09IEEE 802.15.4: fix uninitialized variable warningPeter Wu1-1/+1
"status" is set by decrypt_ieee802154_payload, but GCC 7.3 is unaware: epan/dissectors/packet-ieee802154.c: In function 'ieee802154_decrypt_payload': epan/dissectors/packet-ieee802154.c:1912:9: error: 'status' may be used uninitialized in this function [-Werror=maybe-uninitialized] switch (status) { ^~~~~~ Change-Id: Ia66e6a80f277470f8b242107275ea7467c37e212 Reviewed-on: https://code.wireshark.org/review/26372 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Intern MaxMinDB IPv6 addresses.Gerald Combs1-3/+14
Make sure our IPv6 addresses are unique and allocated, similar to our strings. Bug: 14514 Change-Id: I602b3b0ec4674fb2bc8cbaa973a73a6f3188e0c3 Reviewed-on: https://code.wireshark.org/review/26371 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-08MaxMind DB fixups.Gerald Combs1-9/+12
Make sure the text we read is null terminated. Properly strip our lines and chunked strings. Copy over cast and strtod fixes from change 26347. Change-Id: I0695e35c446c1bd277c53b458b07e428cdd90fb8 Reviewed-on: https://code.wireshark.org/review/26370 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-08epan: Ignore SIGPIPE.Gerald Combs1-0/+10
We need to ignore SIGPIPE whenever we use maxmind_db. Do so in epan_init. Ping-Bug: 14494 Change-Id: I4372935e371a94c02a79050d59b2e3ee1ba04fee Reviewed-on: https://code.wireshark.org/review/26369 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-08ieee80211: A few cleanups of the HotSpot 2.0 dissection.Richard Sharpe1-7/+8
Change-Id: I9f3eda15612e8b90993a731e5576c311250f93aa Reviewed-on: https://code.wireshark.org/review/26348 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-08GTPv2: Show spare bits in IE UP Function Selection Indication Flags.AndersBroman1-0/+1
Change-Id: Ic1983617e6b21114d55d834780627b0c928c2b83 Reviewed-on: https://code.wireshark.org/review/26365 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-08S1AP: EmergencyAreaIDListForRestart is not an extension IE.AndersBroman2-2/+2
Change-Id: I3dd623e1a2ec3005ee2c810492e4d0fad39ce1d0 Reviewed-on: https://code.wireshark.org/review/26364 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 09:59:39 +0000