Commit Graph

83256 Commits

Author SHA1 Message Date
João Valverde 62c9f333f7 epan: More abs_time_to_str() cleanups
Use abs_time_to_str() to implement abs_time_secs_to_str().

Misc cleanups.
2021-12-29 13:50:21 +00:00
João Valverde 64572a11f9 dfilter: Use better error messages for absolute times 2021-12-29 02:25:38 +00:00
João Valverde 7e041118d8 epan: Add back ABSOLUTE_TIME_NTP_UTC representation
It is a special case the prints "NULL" if time is zero.
2021-12-29 00:30:17 +00:00
Christian Svensson 0d471d9fe9 sflow: Rename fields to match protocol specification
- Rename "Original packet length" to "Sampled header length"
 - Rename "Payload removed" to "Payload stripped"

Signed-off-by: Christian Svensson <blue@cmd.nu>
2021-12-28 21:57:21 +00:00
Guy Harris b38987573e text_import: use 4-space indentation for number_of_padding_bytes().
It's the only routine that doesn't use 4-space indentation.
2021-12-28 20:57:28 +00:00
Chuck Craft 9a9a754378 Qt: byteview mouse hover highlights not selects 2021-12-28 20:39:11 +00:00
Gerald Combs a03f43645d Kafka: Be more strict when dissecting varints.
The Kafka dissector uses the return value of tvb_get_varint to advance
the packet offset in many places. If tvb_get_varint fails it returns 0,
which means our offset isn't guaranteed to advance. Stop dissection
whenever that happens. Fixes #17811.
2021-12-28 19:06:10 +00:00
Dario Lombardo 1810ad641d github: bump msbuild version. 2021-12-28 18:49:24 +00:00
Dario Lombardo c3bbca8e73 github: update artifacts uploading. 2021-12-28 18:49:24 +00:00
John Thacker 44d27e975a text_import: Switch default IPv4 addresses to what text2pcap used
text2pcap used 10.1.1.1 and 10.2.2.2 for default IPv4 addresses,
and "Import From Hex Dump" used 1.1.1.1 and 2.2.2.2. The former
are a little bit better for defaults since they're RFC 1918
private IP addresses, so let's use them for the common code.
2021-12-28 11:00:46 -05:00
Jaap Keuter fb48954f26 Update model list based on libgphoto2 repo dated 27 dec 2021 2021-12-28 13:28:44 +00:00
João Valverde 445dcd3117 epan: Extend abs_time_to_str() with a flags argument 2021-12-28 04:05:20 +00:00
João Valverde 8b03ead540 EditorConfig: Fix epan/to_str.h 2021-12-28 02:29:26 +00:00
João Valverde 865e2a3754 epan: Refactor abs_time_to_str()
Refactor the common code in abs_time_to_str() and
abs_time_secs_to_str() into separate functions, to
avoid code duplication and improve maintainability.
2021-12-28 01:49:06 +00:00
João Valverde da790dd7bf wsutil/nstime: Fix ISO8601 parsing with tz offset separator
The format "23:59:59+2000" is valid but the code assumes that
if the date/time format uses separators, the timezone offset
must have them too. Fix that. Add test cases for timezone
offsets +HHMM and +HH.
2021-12-27 23:44:58 +00:00
João Valverde 737a76f6c9 wsutil/nstime: Add tests for iso8601_to_nstime() 2021-12-27 23:44:58 +00:00
João Valverde 48bb9534d7 wsutil/inet_addr: Add a cast to squelch a narrowing warning 2021-12-27 23:11:51 +00:00
João Valverde a566076839 epan: Move time display types to field_display_e
This makes it easier to understand the code, avoids conflicts
and ugly and unnecessary casts.

The field display enum has evolved over time from integer types
to a type generic parameter.
2021-12-27 22:31:31 +00:00
Dario Lombardo 0258ef3a04 github: remove scheduled runs from repo-lockdown.
Add issue auto-close while here, since the action supports it
as well.

Fix: #17805.
2021-12-27 21:56:55 +00:00
João Valverde a0f1ffec71 epan: Remove obsolete header "garrayfix.h" 2021-12-27 21:16:05 +00:00
João Valverde 318bbfce60 EditorConfig: Fix proto.h 2021-12-27 20:29:50 +00:00
João Valverde 14a1dfbe10 wsutil/inet_addr: Refactor to use C99/POSIX types
Rewrite ws_inet_pton{4,6} and ws_inet_ntop{4,6} without
GLib types.

Check for strerrorname_np() and use that is available,
to simplify error handling.

Add some minimal tests.
2021-12-27 19:02:50 +00:00
Stig Bjørlykke 6343967eef Qt: Disable Import Hex Dump IPv6 check box when unused
Only enable the IPv6 option check box when adding a IP header.
Improve the tooltip text.
2021-12-27 18:38:35 +01:00
John Thacker 7dc79c9a2f text_import: Fix custom IPv6 address handling
Fix a case where one address but not the other was set to a nonzero
IPv6 address and direction was indiciated.
2021-12-27 10:28:44 -05:00
John Thacker a42723359e import text: add IPv6 option, custom IPv6 addresses
Add the option to use IPv6 instead of IPv4 for dummy headers,
including custom source and destination address, to the
"Import from Hex Dump" GUI box. Related to #16724
2021-12-27 10:06:02 -05:00
John Thacker 756cc28592 import_text: Save IP address settings 2021-12-27 14:35:01 +00:00
João Valverde 0d5bfd44a8 Use a wrapper function to call strptime()
Encapsulate the feature requirements for strptime() in a
portability wrapper.

Use _GNU_SOURCE to expose strptime. It should be enough on glibc
without the side-effect of selecting a particular SUS version,
which we don't need and might hide other definitions.
2021-12-27 14:07:32 +00:00
John Thacker b83cefd2fe import text: Custom IPv4 source and destination address from GUI
Add the ability to set custome IPv4 source and destination addresses
to the "Import from Hex Dump" GUI menu. Part of #16724.
2021-12-27 08:32:34 -05:00
Pascal Quantin dcbd456e69 doc: fix a copy/paste error and a typo 2021-12-27 13:01:42 +00:00
João Valverde c11ceb08ed CMake: Fix timespec_get() detection on Windows
Replace some instances of check_function_exists() with
check_symbol_exists(). From the CMake documentation:

    - check_function_exists() can't detect functions that are inlined
    in headers or specified as a macro.
    - check_function_exists() can't detect anything in the 32-bit versions
    of the Win32 API, because of a mismatch in calling conventions.
    - check_function_exists() only verifies linking, it does not verify
    that the function is declared in system headers.

This fixes timespec_get() detection on Windows.
2021-12-27 12:16:05 +00:00
João Valverde c457c8a396 CMake: Remove duplicate definition in config.h 2021-12-27 11:29:48 +00:00
Joakim Karlsson 1339d30de3 pfcp: Update to 3GPP TS 29.244 V17.3.0 2021-12-27 10:56:17 +01:00
Gerald Combs b851a9fbc6 Docs: Remove unneeded markup in the Wireshark man page.
Remove empty list continuations and continuations around single lines of
text.
2021-12-27 08:25:52 +00:00
Gerald Combs 87eca12c38 Docs: Document our diagnostic output options.
Add docs/diagnostic-options.adoc, which is a snippet that documents our
various --log-* options. Include it in the dumpcap, rawshark, and tshark
man pages.

Make the ws_log_print_usage output more consistent.
2021-12-27 08:04:25 +00:00
John Thacker b1b1d24548 wsutil: Declare ws_inet_* with extern "C"
Specify C linkage for ws_inet_pton[4|6] in order to use them
from the GUI.
2021-12-27 01:02:02 -05:00
John Thacker 23355cddf6 import_text: Add ASCII identification checkbox
Add a checkbox for the extra detection for ASCII in a hex+ASCII
hexdump even when the text looks like hexbytes to Import from Hex
Dump. Save and restore it from the settings. Work towards #16724.
2021-12-26 19:13:25 -05:00
John Thacker 0dfc6414e0 text2pcap: Add Export PDU
Support Export PDU functionality from text2pcap. Related to #16724.
2021-12-26 14:07:37 -05:00
Gerald Combs a3df9fe13f [Automatic update for 2021-12-26]
Update manuf, services enterprise numbers, translations, and other items.

Asterix failed.
2021-12-26 18:40:31 +00:00
Gerald Combs 3600de75c1 Docbook: Make our prefaces self-contained. 2021-12-26 09:52:18 -08:00
Guy Harris b3215d99ca rfc7468: don't use for (;;) for tvb_find_line_end() loops.
If you're past the end of the tvbuff, tvb_find_line_end() will, when
reassembly is not being done, return a zero-length line without
advancing next_offset, so, unless you check for being past the end of
the tvbuff, you'll loop forever.

Fixes #17801.
2021-12-25 22:22:31 -08:00
John Thacker b9e299b1a3 text2pcap test: Add fractional seconds qualifier
text2pcap now has support for fractional sections using the field
descriptor %f and doesn't support the old method, so change the format
string in the test.  None of the existing tests depended on the
fractional seconds being correct.
2021-12-25 21:01:12 -05:00
John Thacker 9e7b5c9189 text2pcap: Use debug level
Pass the debug level parameter from text2pcap to text_import
so that it is used as it was before to print internal parsing
information.
2021-12-25 15:52:46 -05:00
Gerald Combs 38dbb8486f text import: Remove an unneeded cast.
Don't bother casting to a guint32. We check for large values further on.
2021-12-25 19:43:35 +00:00
John Thacker 5f3197e8be text2pcap: Update usage for new time format options 2021-12-25 13:26:04 -05:00
John Thacker 8cafcfa5a9 text2pcap: Support OFFSET_NONE 2021-12-25 09:19:07 -05:00
John Thacker f63571c3e8 text_import: Ignore offsets in no offset mode
If we're in the no offset mode and we parse an offset,
warn the user and ignore. At the very beginning of the file try
adding it to the preamble, maybe there's something unfortunate
like an all numeric time stamp format (ISO-8601 Basic).
2021-12-25 08:39:29 -05:00
Guy Harris 126971191a text2pcap: use ws_strtou8() to process the -i flag.
Based on Gerald's !5562.

Use ws_strtou8() rather than doing all the error checking ourselves.

Have a common routine to call when an IP "next protocol" value is set;
it does all the necessary work, and could also check for colliding
settings, such as combining "-i 99" with "-s", "-S", "-u", or "-T", or
combining "-u" with "-T", or....
2021-12-24 23:52:47 -08:00
Guy Harris 37d90b7c04 text2pcap: have a Boolean flag indicating whether -i was specified.
That avoids worrying about finding an appropriate out-of-range value to
indicate whether -i was specified or not.
2021-12-24 23:05:52 -08:00
John Thacker 857d518c17 text_import: Use time format directly
Also use g_strcmp0 for setting the ISO format.
2021-12-25 03:35:24 +00:00
John Thacker 54c4c7b0a6 text_import: Another explicit cast for unsigned long and clang 2021-12-24 21:54:40 -05:00