Commit Graph

83015 Commits

Author SHA1 Message Date
John Thacker 2df6ab0906 ieee80211: BASE_HEX and BASE_CUSTOM are mutually exclusive 2021-12-12 17:09:34 -05:00
John Thacker 9a054d7837 IEEE80211: Remove ENC_NA from string encoding
With the recent commit changing the pre commit check, need
this to make a different change.
2021-12-12 21:41:35 +00:00
John Thacker a68be23b7e proto: Don't crash on adding 64 bit BASE_CUSTOM column
Similar to elsewhere, in proto_custom_set don't call hf_try_val[64]_to_str
if BASE_CUSTOM is set, even if hfinfo->strings is non-null. Fix #17762.
2021-12-12 21:22:57 +00:00
Oscar Gonzalez de Dios e29c6691d0 PCEP: As per RFC 8408, RP object can have optional TLVs.
The decoding of TLVs in RP object is added
2021-12-12 19:45:22 +00:00
Gerald Combs a6cffab3a1 [Automatic update for 2021-12-12]
Update manuf, services enterprise numbers, translations, and other items.
2021-12-12 17:54:42 +00:00
John Thacker 69641adfca doc: Add lbmr_* -z stats to tshark manual
Add some more undocumented -z statistics. Ping #8353.
2021-12-12 14:21:15 +00:00
João Valverde f52611de89 Remove obsolete macro HFI_DECLS 2021-12-12 13:24:51 +00:00
João Valverde b332c3dd0b Netlink netfilter: Fix a pre-commit check
epan/dissectors/packet-netlink-netfilter.c:  FT_UINT32:        proto_tree_add_item(tree, hf_nfq_hwaddr_addr, tvb, offset, addrlen, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);

(These messages are wrong, this field is FT_ETHER, not FT_UINT32).
2021-12-12 13:24:51 +00:00
João Valverde 47651506bf Netlink psample: Fix a pre-commit check
epan/dissectors/packet-netlink-psample.c (15 (of 15) fields)
netlink.psample.cmd doesn't match PROTOABBREV of netlink-psample
netlink.psample.attr_type doesn't match PROTOABBREV of netlink-psample
netlink.psample.iifindex doesn't match PROTOABBREV of netlink-psample
netlink.psample.oifindex doesn't match PROTOABBREV of netlink-psample
netlink.psample.origsize doesn't match PROTOABBREV of netlink-psample
netlink.psample.sample_group doesn't match PROTOABBREV of netlink-psample
netlink.psample.group_seq_num doesn't match PROTOABBREV of netlink-psample
netlink.psample.sample_rate doesn't match PROTOABBREV of netlink-psample
netlink.psample.tunnel doesn't match PROTOABBREV of netlink-psample
netlink.psample.group_refcount doesn't match PROTOABBREV of netlink-psample
netlink.psample.out_tc doesn't match PROTOABBREV of netlink-psample
netlink.psample.out_tc_occ doesn't match PROTOABBREV of netlink-psample
netlink.psample.latency doesn't match PROTOABBREV of netlink-psample
netlink.psample.timestamp doesn't match PROTOABBREV of netlink-psample
netlink.psample.proto doesn't match PROTOABBREV of netlink-psample
2021-12-12 13:24:51 +00:00
João Valverde 6ec429622c fix-encoding-args.pl: Strings ftypes don't need "ENC_NA" 2021-12-12 13:24:44 +00:00
João Valverde 04d25fb64c fix-encoding-args.pl: Remove dead code 2021-12-12 13:12:56 +00:00
João Valverde cace66d45d The macro 'va_copy' is C99, use that 2021-12-12 11:56:17 +00:00
João Valverde 7cffcfa835 dfilter: Remove a default switch case 2021-12-12 10:16:27 +00:00
Роман Донченко a027211ea2 jpeg: Implement dissection for Exif-specific IFDs 2021-12-12 07:29:31 +00:00
Роман Донченко e5e2974546 jpeg: Don't create an unnecessary dummy tree item
Exif does not define the order of elements in the Exif data, so if there's
empty space in front of IFD #0, it might be used for other IFDs or standalone
values.

As such, don't create a dummy tree item covering that space.
2021-12-12 07:29:31 +00:00
Moshe Kaplan 7567432ec4 Add remaining header files to Doxygen
Add @file markers for remaining
header files so that Doxygen will
generate documentation for them.
2021-12-12 03:56:35 +00:00
Gerald Combs b62197c283 CMake+GitLab CI: Reduce verbosity.
For various commands, make sure we show warnings and errors, but not
other extraneous information such as filenames.
2021-12-11 13:57:29 -08:00
João Valverde 773420bad9 Fix extcap-base.[ch] indentation
Make header indentation consistent with C source.

Fix EditorConfig settings.
2021-12-11 17:49:40 +00:00
Gerald Combs 7736e69b57 GitLab CI: Simplify some checks.
Assume that we have sufficient AWS credentials if our S3 destination
environment variable is set.
2021-12-11 09:33:52 -08:00
João Valverde f5a40ada4d Netfilter rtnetlink: Fix some names for consistency 2021-12-11 17:02:16 +00:00
João Valverde 6c5d00a746 epan: Remove obsolete function proto_register_fields_manual()
Related with #17774.
2021-12-11 17:02:16 +00:00
João Valverde a38c4ea454 Netlink: Convert to normal proto tree API 2021-12-11 17:02:12 +00:00
João Valverde 26fb504f67 Netlink generic: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde ae600d3bd1 Netlink net_dm: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde 52064a51e1 Netlink psample: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde aec2554d29 Netlink sock_diag: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde 7559a718ec Netlink netfilter: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde 4458c910a4 Netlink rtnetlink: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde e67ce21f81 Netlink nl80211: Convert to normal proto tree API 2021-12-11 16:32:33 +00:00
João Valverde 3230ed2dac Netlink: Change dissector API to use HF index
Instead of passing a pointer to a header_field_info structure,
pass an integer index to the registry.

This allows each dissector to be converted to a more conventional
structure.
2021-12-11 16:32:28 +00:00
João Valverde 53cded5062 wslog: Add backward compatibility with 'console.log.level'
This adds some custom logic to check if we were given
the obsolete 'console.log.level' setting from the CLI
arguments, that specified the log level using a bitmask
copied from GLib. If we find that map the bitmask to a
wslog log level.

In any case the option is not removed from the argv (unlike
other wslog arguments like --log-level, etc.).

Adds deprecation warning for 'console.log.level' printed to
the console.

Related to #17763.
2021-12-11 00:19:09 +00:00
João Valverde 7d7873187e GUI: Lower log level of "up and ready" message
This lowers the level of this message from "message" to
"info". This has two side-effects:
  - It is not displayed by default
  - It is printed to stdout instead of stderr.

Some users were depending on this message. Restore this to
the level it had before 05ed76d4. Even though this output is
not considered a stable interface restoring the old behavior
helps them and has no meaningful usability downsides. The
changes in 05ed76d4 were experimental anyway.

Related to #17763.
2021-12-11 00:01:41 +00:00
John Thacker 7699d54094 IEC101/104: Support different link address sizes
IEC 101 can have a link address of zero, one, or two octets.
The IOA address can also be one, two, or three octets.
Remove unnecessary apply_prefs function. Fix #17775
2021-12-10 15:59:46 -05:00
João Valverde d2a9cb940a epan: Remove new proto tree API
Remove experimental new API.

Fix Netlink dissector to compile with normal proto tree API.

Closes #17774.
2021-12-10 14:37:01 +00:00
John Thacker f888074def cli: Cleanup rtspstat tap output format
Actually output the packet count for RTSP response status codes,
and align the columns between requests and response. (This CLI-only
stat is largely redundant with rtsp,tree but it might as well work.)
2021-12-10 14:15:29 +00:00
John Thacker 61b402cbe9 doc: Update tshark documents of stat options
Lost one option when updating in the previous commit, restore
2021-12-10 08:12:57 -05:00
John Thacker c0933a18da doc: Update tshark manual for undocumented -z statistics
This commit includes all statistics / taps that exist up through the
3.4.x release. Another commit will handle the ones added in the 3.6
branch. Mention that statistics are unaffected by the display filter
(but are affected by capture and read filters, and usually have their
own filters) at the top rather than repeating the same boilerplate
in half the options.

Ping #8353
2021-12-10 00:20:44 +00:00
Pascal Quantin cd752deeac Windows: upgrade Npcap to 1.60 2021-12-09 22:41:07 +01:00
João Valverde 3638ca74c4 YAMI: Convert to old proto tree API
Related with #17774.
2021-12-09 11:16:55 +00:00
João Valverde c87f7a7141 STCSIG: Convert to old proto tree API
Related with #17774.
2021-12-09 11:10:15 +00:00
João Valverde 5896dfe6af NFLOG: Convert to old proto tree API
Related with #17774.
2021-12-09 11:05:03 +00:00
João Valverde 175d5c8660 MINT: Convert to old proto tree API
Related with #17774.
2021-12-09 11:00:56 +00:00
João Valverde edfe072186 JSON: Convert to old proto tree API
Related with #17774.
2021-12-09 10:49:53 +00:00
João Valverde f6fb1c387f Gadu-Gadu: Convert to old proto tree API
Related with #17774.
2021-12-09 10:43:11 +00:00
João Valverde 497d03aedd ERSPAN: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00
João Valverde 6faf2450ea Bitcoin: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00
João Valverde a0d5bd67e6 GIF: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00
João Valverde b9ed05f6b8 HPEXT: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00
João Valverde 165384f74f FCDNS: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00
João Valverde db5071b647 daytime: Convert to old proto tree API
Related with #17774.
2021-12-09 10:31:55 +00:00