*shark: Update help and manpage for name resolving
Add 'v' option for VLAN ID resolving and get rid of deprecated 'C' option. Bug: 14826 Change-Id: I63104f4a465d251048693ad02882ea7eb2c4d926 Reviewed-on: https://code.wireshark.org/review/30029 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
75c46e80bf
commit
8dfaa8fa7c
|
@ -183,6 +183,8 @@ B<t> to enable transport-layer port number resolution
|
|||
|
||||
B<d> to enable resolution from captured DNS packets
|
||||
|
||||
B<v> to enable VLAN IDs to names resolution
|
||||
|
||||
=item -o E<lt>preferenceE<gt>:E<lt>valueE<gt>
|
||||
|
||||
Set a preference value, overriding the default value and any value read
|
||||
|
|
|
@ -676,6 +676,8 @@ resolution
|
|||
|
||||
B<t> to enable transport-layer port number resolution
|
||||
|
||||
B<v> to enable VLAN IDs to names resolution
|
||||
|
||||
=item -o E<lt>preferenceE<gt>:E<lt>valueE<gt>
|
||||
|
||||
Set a preference value, overriding the default value and any value read
|
||||
|
|
|
@ -499,6 +499,8 @@ B<t> to enable transport-layer port number resolution
|
|||
|
||||
B<d> to enable resolution from captured DNS packets
|
||||
|
||||
B<v> to enable VLAN IDs to names resolution
|
||||
|
||||
=item -o E<lt>preference/recent settingE<gt>
|
||||
|
||||
Set a preference or recent value, overriding the default value and any value
|
||||
|
|
|
@ -76,7 +76,7 @@ Input file:
|
|||
Processing:
|
||||
-R <read filter> packet filter in Wireshark display filter syntax
|
||||
-n disable all name resolutions (def: all enabled)
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtCd"
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtdv"
|
||||
-d <layer_type>==<selector>,<decode_as_protocol> ...
|
||||
"Decode As”, see the man page for details
|
||||
Example: tcp.port==8888,http
|
||||
|
@ -295,6 +295,7 @@ argument is a string that may contain the letters `m` to enable MAC address
|
|||
resolution, `n` to enable network address resolution, and `t` to enable
|
||||
transport-layer port number resolution. This overrides `-n` if both `-N` and
|
||||
`-n` are present. The letter `d` enables resolution from captured DNS packets.
|
||||
The letter `v` enables resolution from VLAN IDs to names.
|
||||
|
||||
-o <preference or recent settings>::
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ Processing:
|
|||
-F <field> field to display
|
||||
-m virtual memory limit, in bytes
|
||||
-n disable all name resolution (def: all enabled)
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtd"
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtdv"
|
||||
-p use the system's packet header format
|
||||
(which may have 64-bit timestamps)
|
||||
-R <read filter> packet filter in Wireshark display filter syntax
|
||||
|
|
|
@ -38,7 +38,7 @@ Processing:
|
|||
-Y <display filter> packet displaY filter in Wireshark display filter
|
||||
syntax
|
||||
-n disable all name resolutions (def: all enabled)
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtCd"
|
||||
-N <name resolve flags> enable specific name resolution(s): "mnNtdv"
|
||||
-d <layer_type>==<selector>,<decode_as_protocol> ...
|
||||
"Decode As", see the man page for details
|
||||
Example: tcp.port==8888,http
|
||||
|
|
|
@ -4932,10 +4932,6 @@ string_to_name_resolve(const char *string, e_addr_resolve *name_resolve)
|
|||
case 't':
|
||||
name_resolve->transport_name = TRUE;
|
||||
break;
|
||||
case 'C':
|
||||
/* DEPRECATED */
|
||||
/* name_resolve->concurrent_dns */
|
||||
break;
|
||||
case 'd':
|
||||
name_resolve->dns_pkt_addr_resolution = TRUE;
|
||||
break;
|
||||
|
|
|
@ -190,7 +190,7 @@ print_usage(FILE *output)
|
|||
fprintf(output, " -m virtual memory limit, in bytes\n");
|
||||
#endif
|
||||
fprintf(output, " -n disable all name resolution (def: all enabled)\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtd\"\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtdv\"\n");
|
||||
fprintf(output, " -p use the system's packet header format\n");
|
||||
fprintf(output, " (which may have 64-bit timestamps)\n");
|
||||
fprintf(output, " -R <read filter> packet filter in Wireshark display filter syntax\n");
|
||||
|
|
|
@ -153,8 +153,8 @@ class case_tshark_name_resolution_clopts(subprocesstest.SubprocessTestCase):
|
|||
def test_tshark_valid_name_resolution(self):
|
||||
if not config.canCapture():
|
||||
self.skipTest('Test requires capture privileges and an interface.')
|
||||
# $TSHARK -N mntC -a duration:1 > ./testout.txt 2>&1
|
||||
self.assertRun((config.cmd_tshark, '-N', 'mntC', '-a', 'duration: 1'))
|
||||
# $TSHARK -N mnNtdv -a duration:1 > ./testout.txt 2>&1
|
||||
self.assertRun((config.cmd_tshark, '-N', 'mnNtdv', '-a', 'duration: 1'))
|
||||
|
||||
# XXX Add invalid name resolution.
|
||||
|
||||
|
|
2
tshark.c
2
tshark.c
|
@ -370,7 +370,7 @@ print_usage(FILE *output)
|
|||
fprintf(output, " -Y <display filter> packet displaY filter in Wireshark display filter\n");
|
||||
fprintf(output, " syntax\n");
|
||||
fprintf(output, " -n disable all name resolutions (def: all enabled)\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtCd\"\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtdv\"\n");
|
||||
fprintf(output, " -d %s ...\n", DECODE_AS_ARG_TEMPLATE);
|
||||
fprintf(output, " \"Decode As\", see the man page for details\n");
|
||||
fprintf(output, " Example: tcp.port==8888,http\n");
|
||||
|
|
|
@ -123,7 +123,7 @@ commandline_print_usage(gboolean for_help_option) {
|
|||
fprintf(output, "Processing:\n");
|
||||
fprintf(output, " -R <read filter> packet filter in Wireshark display filter syntax\n");
|
||||
fprintf(output, " -n disable all name resolutions (def: all enabled)\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtd\"\n");
|
||||
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mnNtdv\"\n");
|
||||
fprintf(output, " -d %s ...\n", DECODE_AS_ARG_TEMPLATE);
|
||||
fprintf(output, " \"Decode As\", see the man page for details\n");
|
||||
fprintf(output, " Example: tcp.port==8888,http\n");
|
||||
|
|
|
@ -79,7 +79,8 @@ dissect_opts_handle_opt(int opt, char *optarg_str_p)
|
|||
"\t'n' to enable network address resolution\n"
|
||||
"\t'N' to enable using external resolvers (e.g., DNS)\n"
|
||||
"\t for network address resolution\n"
|
||||
"\t't' to enable transport-layer port number resolution");
|
||||
"\t't' to enable transport-layer port number resolution\n"
|
||||
"\t'v' to enable VLAN IDs to names resolution");
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue