aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUli Heilmeier <uh@heilmeier.eu>2016-03-22 14:11:51 +0100
committerMichael Mann <mmann78@netscape.net>2016-03-22 15:51:44 +0000
commit67a137a3bf5b11c77976b33635af0cfa157c41fa (patch)
treeb38c72d792f513e126795e7334eb1528a7e41933
parent0db6f9d91b27d35cafaec156f22aec998820dc3e (diff)
WSUG: Add documentation for vlan id resolving
Ping-Bug: 11209 Change-Id: Ife36b7ad02d22e2fa53eedc8d49a81ff8c578844 Reviewed-on: https://code.wireshark.org/review/14554 Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--docbook/wsug_src/WSUG_app_files.asciidoc17
-rw-r--r--docbook/wsug_src/WSUG_chapter_advanced.asciidoc4
2 files changed, 21 insertions, 0 deletions
diff --git a/docbook/wsug_src/WSUG_app_files.asciidoc b/docbook/wsug_src/WSUG_app_files.asciidoc
index cd81d6bd2c..c0266d999e 100644
--- a/docbook/wsug_src/WSUG_app_files.asciidoc
+++ b/docbook/wsug_src/WSUG_app_files.asciidoc
@@ -112,6 +112,7 @@ different folders are used for these files.
|_services_|Network services.|/etc/services, $HOME/.wireshark/services|%WIRESHARK%\services, %APPDATA%\Wireshark\services
|_subnets_|IPv4 subnet name resolution.|/etc/subnets, $HOME/.wireshark/subnets|%WIRESHARK%\subnets, %APPDATA%\Wireshark\subnets
|_ipxnets_|IPX name resolution.|/etc/ipxnets, $HOME/.wireshark/ipxnets|%WIRESHARK%\ipxnets, %APPDATA%\Wireshark\ipxnets
+|_vlans_|VLAN ID name resolution.|$HOME/.wireshark/vlans|%APPDATA%\Wireshark\vlans
|_plugins_|Plugin directories.|/usr/share/wireshark/plugins, /usr/local/share/wireshark/plugins, $HOME/.wireshark/plugins|%WIRESHARK%\plugins\<version>,%APPDATA%\Wireshark\plugins
|_temp_|Temporary files.|Environment: TMPDIR|Environment: TMPDIR or TEMP
|===============
@@ -328,6 +329,22 @@ The settings from this file are read in at program start and never written by
Wireshark.
--
+_vlans_::
+Wireshark uses the files listed in <<AppFilesTabFolders>> to translate VLAN tag IDs into names.
++
+--
+Each line in this file consists of one VLAN tag ID and a describing name separated by whitespace or tab.
+
+An example is:
+----
+123 Server-LAN
+2049 HR-Client-LAN
+----
+
+The settings from this file are read in at program start and never written by
+Wireshark.
+--
+
_plugins_ folder::
Wireshark searches for plugins in the directories listed in
<<AppFilesTabFolders>>. They are searched in the order listed.
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc b/docbook/wsug_src/WSUG_chapter_advanced.asciidoc
index 58f970f807..eeccb568bb 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_advanced.asciidoc
@@ -745,6 +745,10 @@ Try to resolve a TCP/UDP port (e.g. 80) to something more ``human readable''.
__TCP/UDP port conversion (system service)__: Wireshark will ask the operating
system to convert a TCP or UDP port to its well known name (e.g. 80 -> http).
+==== VLAN ID resolution
+
+To get a describing name for a VLAN tag ID a vlans file can be used.
+
// XXX - mention the role of the /etc/services file (but don't forget the files and folders section)!
[[ChAdvChecksums]]