diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-07-25 09:24:48 -0400 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-07-25 17:05:01 +0000 |
| commit | 190e313e9d949a837a0b3c3fe027647b35c2f8be (patch) | |
| tree | 62c25c82c240d5aff4ef24b582c40c08d937e3d9 /docbook | |
| parent | 3fc4a831e035604b0af14ed8a5c9f6596a3448d0 (diff) | |
DNS: move DNS name resolution pref to Name Resolution prefs
Move the boolean flag for using captured DNS packet info for name resolution
to the Name Resolution preferences settings, as it was rather surprising to
disable Name Resolution preferences and still have names being resolved. Also
disble them all if the '-n' command line switch is used, and re-enable it for
a 'd' character in the '-N' option.
Bug: 10337
Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917
Reviewed-on: https://code.wireshark.org/review/9786
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsug_src/WSUG_app_tools.asciidoc | 4 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_customize.asciidoc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docbook/wsug_src/WSUG_app_tools.asciidoc b/docbook/wsug_src/WSUG_app_tools.asciidoc index 1a5c3098cd..ad5c02ecae 100644 --- a/docbook/wsug_src/WSUG_app_tools.asciidoc +++ b/docbook/wsug_src/WSUG_app_tools.asciidoc @@ -67,7 +67,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): "mntC" + -N <name resolve flags> enable specific name resolution(s): "mnNtCd" -d <layer_type>==<selector>,<decode_as_protocol> ... "Decode As", see the man page for details Example: tcp.port==8888,http @@ -330,7 +330,7 @@ Processing: packet encapsulation or protocol -F <field> field to display -n disable all name resolution (def: all enabled) - -N <name resolve flags> enable specific name resolution(s): "mntC" + -N <name resolve flags> enable specific name resolution(s): "mnNtCd" -p use the system's packet header format (which may have 64-bit timestamps) -R <read filter> packet filter in Wireshark display filter syntax diff --git a/docbook/wsug_src/WSUG_chapter_customize.asciidoc b/docbook/wsug_src/WSUG_chapter_customize.asciidoc index f33b54430d..219547770d 100644 --- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_customize.asciidoc @@ -77,7 +77,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): "mntC" + -N <name resolve flags> enable specific name resolution(s): "mnNtCd" --disable-protocol <proto_name> disable dissection of proto_name Repeat option for each protocol --enable-heuristic <short_name> enable dissection of heuristic protocol @@ -289,7 +289,8 @@ Turns on name resolving for particular types of addresses and port numbers. The 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 C enables concurrent (asynchronous) DNS lookups. +`-n` are present. The letter `C` enables concurrent (asynchronous) DNS lookups. +The letter `d` enables resolution from captured DNS packets. -o <preference or recent settings>:: |