Commit Graph

82297 Commits

Author SHA1 Message Date
João Valverde bb12a187df CMake: Add guards for PLATFORM sanity check
The sanity check is specific for Visual Studio so add those
guards. The PLATFORM variable is not standard for other toolchains.

Add a default "windows target platform" of Win64.

Add error output for win-setup.ps1.
2021-09-20 15:11:52 +01:00
João Valverde 8726c65267 win-setup.ps1: Be more lax about validating path separators
CMake file(TO_NATIVE_PATH) doesn't do the right thing on MinGW[1],
but Windows supports backslash and forward slash.

[1]https://gitlab.kitware.com/cmake/cmake/-/issues/5939
2021-09-20 14:38:03 +01:00
João Valverde c513188f52 CMake: wsetargv.obj is specific to Visual Studio 2021-09-20 13:27:11 +01:00
Roland Knall 977c73d5b4 Qt: Pad time values for loading times
Pad the loading time values with leading zeros each
Fixes: #17601
2021-09-20 13:06:40 +02:00
Martin Mathieson f0a375cf21 ORAN FH CUS: Add expert info check for extlen 0 2021-09-20 10:20:32 +01:00
João Valverde debd6bffae version info: Reduce locale display.
The locale information can be excessively verbose. Cut down the
number of categories displayed to one, arguably the most relevant
for troubleshooting purposes.
2021-09-19 17:13:29 +00:00
Gerald Combs 2cb684c92d [Automatic update for 2021-09-19]
Update manuf, services enterprise numbers, translations, and other items.
2021-09-19 16:52:44 +00:00
João Valverde b054286744 ws_getopt: Cleaner better __getopt_msg()
This is more readable and the extra error checking is functionally
the same as the original upstream code too, that trigerred some
compiler warnings.

Add missing 'static' qualifier.

Add a test for 'ws_opterr'.
2021-09-19 13:48:09 +01:00
Dr. Lars Völker 4941809359 TECMP: change Capture Module ID in UAT to hex
The Capture Module ID is shown in Hex but configured in the UAT in
decimal. This patch makes it consistent.
2021-09-19 09:49:35 +00:00
John Thacker ac0b1d42f3 dfilter: Allow bytestrings that are also protocol names on RHS
Protocol names can only be on the left hand side of filter expressions.
If a protocol name with an even number of characters ("fc", "dc", "ff",
"fefd", etc.) is on the right hand side of a filter expressions and
can be interpreted as a byte string instead, do so.  Fix #12810.
2021-09-18 22:42:50 +00:00
João Valverde 750cc38669 epan: Remove some extraneous #ifdefs
If a macro identifier is not defined it evaluates to zero in an
expression, so the outer #ifdef is unnecessary and should be
avoided (the less the better).

Add a missing CMake comment while here.
2021-09-18 23:25:31 +01:00
Martin Mathieson dd667dddf0 Some spelling fixes 2021-09-18 20:52:04 +00:00
Stig Bjørlykke 36977acfbf Qt: Store Import Hex Dump settings
Store all user specified values from the "Import from Hex Dump"
dialog in a profile import_hexdump.json file.

Set default ExportPDU dissector to "data".
Fixed a minor typo in a help text.
2021-09-18 18:20:57 +00:00
ismaelrti acf9b52b78 RTPS: Added option to limit the number of items dissected in data samples.
Added option in protocols->RTPS for setting the maximun number of items
dissected in user data samples.
2021-09-18 14:13:26 +00:00
João Valverde a34a234cf2 wslog: Add ws_log_buffer()
Use the new API with dot11decrypt debug.
2021-09-18 10:59:10 +01:00
Uli Heilmeier a918325324 SSH: Add fingerprint hassh, hasshserver fields
Calculate hassh and hasshServer to fingerprint SSH server and client
as defined at https://github.com/salesforce/hassh

Related: wireshark/wireshark#17595
2021-09-18 08:18:59 +00:00
Jaap Keuter 6e174c17eb InfiniBand: create proper preference change handler out of handoff function 2021-09-18 08:03:02 +00:00
Vivek Mangala f341e045c9 twamp: fixed decoding of control-message sequence
Added check on Command-Number on control message following
Accept-Session to detect the correct state.  There are
various states possible after Accept-Session.
2021-09-18 07:47:12 +00:00
Alexis La Goutte 13c33fa68a text2pcap: Fix -Wmissing-prototypes
warning: no previous prototype for function 'text2pcap_vcmdarg_err' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte be2469b91d thrift: Fix Wmissing-protypes warning
packet-thrift.c:852:1: warning: no previous prototype for function 'dissect_thrift_t_field_header' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte aa9d666acb sparkplug: Fix -Wmissing-prototypes warning
packet-sparkplug.c:142:6: warning: no previous prototype for function 'proto_register_sparkplug' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte d842da234d signal(pdu): Fix -Wmissing-prototypes warnings
packet-signal-pdu.c:267:1: warning: no previous prototype for function 'proto_reg_handoff_signal_pdu_can' [-Wmissing-prototypes]
packet-signal-pdu.c:293:1: warning: no previous prototype for function 'proto_reg_handoff_signal_pdu_lin' [-Wmissing-prototypes]
packet-signal-pdu.c:314:1: warning: no previous prototype for function 'proto_reg_handoff_signal_pdu_someip' [-Wmissing-prototypes]
packet-signal-pdu.c:335:1: warning: no previous prototype for function 'proto_reg_handoff_signal_pdu_pdu_transport' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte 1be344800a r09: Fix -Wmissing-prototypes warning
packet-r09.c:152:1: warning: no previous prototype for function 'proto_register_r09' [-Wmissing-prototypes]
packet-r09.c:217:1: warning: no previous prototype for function 'proto_reg_handoff_r09' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte 7f411bbe80 bblog: Fix -Wmissing-prototypes warning
packet-bblog.c:334:1: warning: no previous prototype for function 'proto_register_bblog' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Alexis La Goutte e1c754262f tiff(file): Fix -Wmissing-prototypes warning
file-tiff.c:840:1: warning: no previous prototype for function 'proto_register_tiff' [-Wmissing-prototypes]
file-tiff.c:1143:1: warning: no previous prototype for function 'proto_reg_handoff_tiff' [-Wmissing-prototypes]
2021-09-18 07:21:36 +00:00
Gerald Combs 05b91f5aaf Docs: Fix some POD markup.
Fix and normalize some of our POD markup.
2021-09-18 05:49:03 +00:00
João Valverde 16eb55b54e IPv6: Rename "SA MAC" to "SLAAC MAC"
The term "SLAAC" is widely used, "SA" is somewhat obscure.
2021-09-17 23:10:35 +01:00
Toni Uhlig a823e34642 Fix build error if ENABLE_SMI=OFF
* introduced with 9b13c4352d
 * HAVE_SMI_VERSION_STRING is always defined if libsmi found

Change-Id: I50480d37a3a6f31bcfe768f030af9176213b7366
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2021-09-17 19:29:48 +00:00
João Valverde dd59d1fcf9 ws_getopt: Add test suite skeleton with some basic tests 2021-09-17 14:15:55 +00:00
João Valverde f80b7babe5 CMake: Remove cmakedefine HAVE_ALLOCA_H
Commit 8df2a73594 removed this
configuration check but didn't remove the corresponding config.h
macro.
2021-09-17 14:15:55 +00:00
Anders Broman b2bc8fd059 RTCP:Fix dissection of MBMS Subchannel field 2021-09-17 13:23:35 +00:00
João Valverde fea994855d Revert "ws_getopt: Disable MSVC warning C4244"
This reverts commit ac3a30f61b.

Clang build also has this warning enabled. Fixed in
3c484f278b.
2021-09-17 02:45:50 +01:00
Gerald Combs 3c484f278b ws_getopt: Fix some clang warnings.
Fix

wsutil/ws_getopt.c:93:21: error: possible misuse of comma operator here [-Werror,-Wcomma]
                return ws_optind++, -1;
                                  ^
wsutil/ws_getopt.c:93:10: note: cast expression to void to silence warning
                return ws_optind++, -1;
                       ^~~~~~~~~~~
                       (void)(    )
wsutil/ws_getopt.c:188:11: error: possible misuse of comma operator here [-Werror,-Wcomma]
                                name++, opt++;
                                      ^
wsutil/ws_getopt.c:188:5: note: cast expression to void to silence warning
                                name++, opt++;
                                ^~~~~~
                                (void)( )
wsutil/ws_getopt.c:199:15: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32]
                        int l = arg-start;
                            ~   ~~~^~~~~~

Add a .editorconfig entry for ws_getopt.[ch].
2021-09-16 18:07:02 -07:00
João Valverde ac3a30f61b ws_getopt: Disable MSVC warning C4244 2021-09-17 00:43:54 +01:00
João Valverde 2deb1c95d9 Merge ws_getopt source files
No need to keep a separate ws_getopt_long.c file.
2021-09-17 00:43:54 +01:00
João Valverde 8df2a73594 Use the musl in-tree getopt_long() everywhere
Besides the obvious limitation of being unavailable on Windows,
the standard is vague about getopt() and getopt_long() has many
non-portable pitfalls and buggy implementations, that increase
the maintainance cost a lot. Also the GNU libc code currently
in the tree is not suited for embedding and is unmaintainable.

Own maintainership for getopt_long() and use the musl implementation
everywhere. This way we don't need to worry if optreset is available,
or if the $OPERATING_SYSTEM version behaves in subtly different ways.

The API is under the Wireshark namespace to avoid conflicts with
system headers.

Side-note, the Mingw-w64 9.0 getopt_long() implementation is buggy
with opterr and known to crash. In my experience it's a headache to
use the embedded getopt implementation if the system provides one.
2021-09-17 00:43:54 +01:00
João Valverde 7462e76884 Add musl getopt_long() source files to project
Copied verbatim from musl 1.2.2.

https://www.musl-libc.org
2021-09-17 00:28:06 +01:00
João Valverde 36a2606064 Debian: Fix symbols 2021-09-17 00:08:41 +01:00
João Valverde 4d873d4ce2 wsutil/to_str: Use a macro to check buffer size 2021-09-17 00:08:41 +01:00
João Valverde 18c155a3ca wsutil: Remove ip6_to_str_buf_with_pfx()
Writing a string prefix shouldn't require a specialized function here.
2021-09-17 00:08:41 +01:00
João Valverde 364df939ea wsutil: Rewrite ip6_to_str_buf() 2021-09-17 00:08:40 +01:00
João Valverde d4c7978f68 wsutil: Add ip_to_str() 2021-09-16 23:18:53 +01:00
João Valverde 8c4a479c52 Move more numerical functions to wsutil/to_str.h 2021-09-16 20:55:03 +01:00
João Valverde cc1e5b8334 Reformat and cleanup epan/to_str.h header 2021-09-16 20:15:28 +01:00
João Valverde 8208c68b49 Debian: Add missing wsutil symbols 2021-09-16 18:23:47 +01:00
João Valverde 8304ced0e6 wsutil: Add some tests for word_to_hex() 2021-09-16 18:21:14 +01:00
João Valverde 24fd8c6740 Move more numerical epan/*to_str() routines to wsutil 2021-09-16 18:21:14 +01:00
Chuck Craft 5b4c7e1c46 NEWS: multiple list indentation levels (nested lists) 2021-09-16 16:27:11 +00:00
João Valverde 0019723b14 Debian: Add missing wsutil symbols 2021-09-16 15:53:15 +00:00
João Valverde 44538f6e4d wsutil: Add tests for to_str_back() 2021-09-16 15:53:14 +00:00