aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-12-19Add g_snprintf() to checkAPIsJoão Valverde1-0/+3
2021-12-19Fix dissector -Wrestrict warningsJoão Valverde3-10/+24
[31/254] Building C object epan/dissectors/CMakeFiles/dissectors.dir/packet-bssgp.c.o /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c: In function ‘de_bssgp_cell_id’: /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c:859:9: warning: ‘snprintf’ argument 4 overlaps destination object ‘add_string’ [-Wrestrict] 859 | snprintf(add_string, string_len, "%s, CI %u", add_string, ci); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c: In function ‘de_bssgp_rim_routing_inf’: /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c:2313:17: warning: ‘snprintf’ argument 4 overlaps destination object ‘add_string’ [-Wrestrict] 2313 | snprintf(add_string, string_len, " %s, RNC-ID %u", add_string, rnc_id); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c: In function ‘de_bssgp_rnc_identifier’: /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-bssgp.c:2767:9: warning: ‘snprintf’ argument 4 overlaps destination object ‘add_string’ [-Wrestrict] 2767 | snprintf(add_string, string_len, " %s, RNC-ID %u", add_string, rnc_id); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [85/254] Building C object epan/dissectors/CMakeFiles/dissectors.dir/packet-gsm_a_bssmap.c.o /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-gsm_a_bssmap.c: In function ‘be_cell_id_type’: /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-gsm_a_bssmap.c:1842:21: warning: ‘snprintf’ argument 4 overlaps destination object ‘add_string’ [-Wrestrict] 1842 | snprintf(add_string, string_len, "%s/RNC-ID (%u)", add_string, value); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-gsm_a_bssmap.c:1869:17: warning: ‘snprintf’ argument 4 overlaps destination object ‘add_string’ [-Wrestrict] 1869 | snprintf(add_string, string_len, "%s/CI (%u)", add_string, value); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [137/254] Building C object epan/dissectors/CMakeFiles/dissectors.dir/packet-mswsp.c.o /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-mswsp.c: In function ‘get_name_from_fullpropspec’: /home/jpv/code/wireshark/wireshark/epan/dissectors/packet-mswsp.c:2975:25: warning: ‘snprintf’ argument 4 overlaps destination object ‘dest’ [-Wrestrict] 2975 | snprintf(dest, bufsize, "%s <INVALID>", dest); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2021-12-19Replace g_snprintf() with snprintf() (dissectors)João Valverde316-1900/+1906
Use macros from inttypes.h with format strings.
2021-12-19Replace g_snprintf() with snprintf()João Valverde68-369/+371
Use macros from inttypes.h with format strings.
2021-12-19epan: Convert to use stdio.h from GLibJoão Valverde59-336/+333
Replace: g_snprintf() -> snprintf() g_vsnprintf() -> vsnprintf() g_strdup_printf() -> ws_strdup_printf() g_strdup_vprintf() -> ws_strdup_vprintf() This is more portable, user-friendly and faster on platforms where GLib does not like the native I/O. Adjust the format string to use macros from intypes.h.
2021-12-19Add missing header, fix macOS buildJoão Valverde2-4/+1
2021-12-195co-legacy: fix a filter stringMartin Mathieson1-1/+1
2021-12-19wsutil: Use snprintf() and ws_strdup_printf()João Valverde19-89/+72
Replace GLib I/O with C library I/O.
2021-12-19wmem: Add ws_strdup_printf() convenience macrosJoão Valverde1-0/+8
The convention (for wmem) is that functions with ws_ use malloc'ed memory. This is just a convenience to avoid having to pass a NULL allocator.
2021-12-19Move wmem string utility functions to wsutilJoão Valverde26-355/+352
2021-12-19README.heuristic: minor updatesMartin Mathieson1-5/+9
2021-12-18text_import: Handle SCTP and minimum packet lengthsJohn Thacker1-21/+42
Correctly handle when a minimum packet length forces fragmentation of SCTP and we are generating dummy SCTP DATA chunk headers: mark fragmentation in the chunk flags and set the transmission sequence number and stream sequence number appropriately. Port from text2pcap commit f8d48662c872813a62c4b87cad4fd5b1afc2fd3c Part of #16724.
2021-12-18wmem: Use vasprintf()João Valverde4-14/+32
Use vasprintf(3) if available to optimize wmem_stdup_printf().
2021-12-18GitLab CI: Switch the Windows MR job back to vanilla CMake.Gerald Combs1-0/+1
After switching to Visual Studio's CMake the Windows MR builds started failing with C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppCommon.targets(241,5): error MSB8066: Custom build for 'C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_de.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_en.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_es.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_fr.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_it.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_ja_JP.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_pl.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_ru.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_sv.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_tr_TR.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_uk.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_zh_CN.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\9829b32238fa3bcc807b02099e4c1642\qtui_autogen.rule' exited with code -1073741819. [C:\builds\wireshark\wireshark\build\ui\qt\qtui_autogen.vcxproj] This appears to be caused by https://gitlab.kitware.com/cmake/cmake/-/issues/22014 which should be fixed in recent versions of the official CMake distribution.
2021-12-18Docs: Fix a README.developer code exampleJoão Valverde1-3/+3
Remove spurious "int". Also prefer "g_string_printf", just for stylistic reasons.
2021-12-18Add string.h to wireshark.hJoão Valverde1-0/+2
Wireshark development requires handling strings a lot. Add this standard header to the base environment to avoid unnecessary repetition.
2021-12-18Add wmem.h to wireshark.hJoão Valverde1-0/+1
Wmem is an alternative to GLib data structures so it should have the same scope and be equally as convenient to use. Wmem does not and cannot depend on anything else other than GLib.
2021-12-18wmem_test: Add more string performance testJoão Valverde1-5/+85
Add some C99 stdio.h numbers to compare with GLib on platforms (such as Windows) where they use different implementations. Add a wmem string test with NULL allocator, to compare wmem and GLib performance with roughly the same memory allocation. Use the block allocator as being more representative of normal wmem performance, instead of using strict, that is normally used for wmem debugging.
2021-12-18wmem_test: Disable performance tests by defaultJoão Valverde1-2/+2
These are not pass/fail tests, so the automation cannot validate them. They just slow down the CI builds. To enable pass -m perf. I think the --verbose comment is wrong, I did not detect any difference in output with or without --verbose.
2021-12-18Exclude wmem_test.c from pre-commitJoão Valverde1-0/+4
2021-12-18Fix wmem_test.c indentationJoão Valverde1-3/+3
2021-12-18Fix wsutil/time_util.c indentationJoão Valverde1-40/+39
2021-12-18Prefer the portable _Noreturn attribute (C11)João Valverde2-1/+5
Use _Noreturn, available with C11, instead of vendor specific attributes. It's not compatible with C++ so we we must keep the old code for now.
2021-12-18Docs: Prefer 64-bit Windows.Gerald Combs3-32/+25
Document the 64-bit Windows build options first and switch to "Wireshark-win64" in a couple of places.
2021-12-18README.tapping: Some minor updatesMartin Mathieson1-5/+10
2021-12-18file-jpeg: Fix value in vals_ifd_tags_exif[]Martin Mathieson1-1/+1
2021-12-18wsdg: cleanup epub3 build warnings - anchors; TOCChuck Craft2-12/+8
Closes #17790
2021-12-18Docs: Add more info about transitioning to C99 fixed-width typesJoão Valverde1-7/+23
2021-12-18DRBD: Tidy up choice of display base for fieldsJoel Colledge1-24/+24
When the dissector was added, BASE_HEX_DEC was used by default for many fields. This is often not the most appropriate display format. The biggest change is that all fields referring to sizes in bytes now consistently use BASE_DEC_HEX.
2021-12-18DRBD: Decode two-phase commit payloadsJoel Colledge1-159/+366
This part of the DRBD protocol requires some state to correctly decode. So we use a conversation to associate the packets. This conversation stores a map of the two-phase commit data required for decoding later packets.
2021-12-18DRBD: Use CF_FUNC with BASE_CUSTOMJoel Colledge1-5/+5
This is apparently necessary to prevent compilations warnings in certain build environments.
2021-12-18DRBD: Add implicit data sizes as fieldsJoel Colledge1-32/+16
Packets such as P_DATA do not have a dedicated field containing the size of the data. It is simply the amount of extra data in the packet. It is useful to be able to show or filter by this value, so add it as a separate field. Also combine the "blksize" and "size" fields, since they have the same meaning. Finally, remove some duplicates of the function decode_payload_data.
2021-12-18DRBD: Decode barrier numbers and block IDs little-endianJoel Colledge1-9/+9
These values are opaque handles as far as the protocol is concerned. They are sent from some node A to B, and then back from B to A. For node B they have no meaning other than as a handle. However, on node A they do have meaning, so it is useful to be able to interpret them. In practice, they are usually little-endian encoded, so decode them accordingly.
2021-12-185co-legacy: Fix dissector unique hash computingAntoine Gardiol1-1/+1
*** CID 1495425: Integer handling issues (CONSTANT_EXPRESSION_RESULT) in packet-5co-legacy.c: 765 in fiveco_hash()
2021-12-18text_import: Fix direction detection in Import from HexdumpJohn Thacker1-1/+1
If the first character of the preamble indicates direction, it needs to be skipped over and not tested as part of the timestamp.
2021-12-17IuUP: Use proto_tree_add_checksum() to show CRC HeaderPau Espin Pedrol1-18/+9
Use standarized API to show checksum information. This also does the checksum validation and shows computed CRC if found incorrect, etc.
2021-12-17IuUP: Fix CRC Header checksPau Espin Pedrol1-1/+1
All the packets coming from a known working source (nano3g femtocell) where being shown as containing wrong CRC Header in Wireshark. pcap file: https://osmocom.org/attachments/download/4744/3g_call_23112021.pcapng
2021-12-17CMake: Disable Wformat-truncation (GCC warning)João Valverde1-0/+7
Converting from GLib functions to stdio.h turns up many of these warnings. They are disabled to allow work to go on and until there is consensus on how to handle them. -Wformat-truncation -Wformat-truncation=1 Level 1 of -Wformat-truncation enabled by -Wformat employs a conservative approach that warns only about calls to bounded functions whose return value is unused and that will most likely result in output truncation.
2021-12-17ASN1: Convert I/O from GLib to stdio.hJoão Valverde45-1150/+1149
2021-12-17Add wsutil/glib-compat.h to wireshark.hJoão Valverde1-0/+1
We are already adding glib.h, we should include glib-compat.h as well in the base environment.
2021-12-17Add inttypes.h to wireshark.hJoão Valverde1-1/+1
For convenience, having to add this header constantly is annoying and kind of pointless, now that we are relying more on stdio.h.
2021-12-17GitLab CI: Enable ccache in the "No options" job.Gerald Combs1-1/+2
2021-12-17GitLab CI: Add back a missing variable.Gerald Combs1-0/+1
2021-12-17DCT2000: For ipprim frames, show header even when no payload dissectorMartin Mathieson1-4/+3
2021-12-17text_import: Time delta between packets without timestampJohn Thacker2-37/+65
The "Import from Hex Dump" time delta for packets without a timestamp was changed to be a nanosecond, but the time resolution for the file created by import_text_dialog is the default, microseconds. Until that is configurable, the time tick used needs to be microseconds like it was before. Clean up the code so that it's a little more consistent about when and how the extra time tick is added, namely: 1. If there is no time format passed in. 2. If time format conversion for the packet fails for any reason. We don't add an extra delta in other situations, e.g. if packets just happen to have the same valid time value. Fix #15562.
2021-12-17text_import: Fix spelling and grammarJohn Thacker14-14/+14
2021-12-16GitLab CI+Qt+Docs: CMAKE_PREFIX_PATH updates.Gerald Combs4-13/+9
Qt's documentation recommends using CMAKE_PREFIX_PATH to designate your Qt installation prefix: https://doc.qt.io/qt-5/cmake-get-started.html. Do so in GitLab's CI and update the Developer's Guide.
2021-12-16GitLab CI: More Windows environment updates.Gerald Combs1-2/+1
Use Visual Studio's CMake in the MR build. Use CMAKE_PREFIX_PATH as recommended by https://doc.qt.io/qt-5/cmake-get-started.html
2021-12-16GitLab CI: Remove a no-longer-needed build.Gerald Combs1-10/+0
Remove the -DENABLE_PCAP=OFF build from the "macOS Arm Package" job. It's no longer needed since we now have a "No options" job.
2021-12-16ci: add no options job.Dario Lombardo1-0/+10
Fix: #17786.