summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docbook/wsdg_graphics/ws-function-blocks.diabin2433 -> 2917 bytes
-rw-r--r--docbook/wsdg_graphics/ws-function-blocks.pngbin8051 -> 28796 bytes
-rw-r--r--docbook/wsdg_src/WSDG_chapter_works.xml38
3 files changed, 26 insertions, 12 deletions
diff --git a/docbook/wsdg_graphics/ws-function-blocks.dia b/docbook/wsdg_graphics/ws-function-blocks.dia
index 5f0619c754..d2d2421a7e 100644
--- a/docbook/wsdg_graphics/ws-function-blocks.dia
+++ b/docbook/wsdg_graphics/ws-function-blocks.dia
Binary files differ
diff --git a/docbook/wsdg_graphics/ws-function-blocks.png b/docbook/wsdg_graphics/ws-function-blocks.png
index be4d7ac5dc..04e6efc460 100644
--- a/docbook/wsdg_graphics/ws-function-blocks.png
+++ b/docbook/wsdg_graphics/ws-function-blocks.png
Binary files differ
diff --git a/docbook/wsdg_src/WSDG_chapter_works.xml b/docbook/wsdg_src/WSDG_chapter_works.xml
index adc656b755..7a222e31a7 100644
--- a/docbook/wsdg_src/WSDG_chapter_works.xml
+++ b/docbook/wsdg_src/WSDG_chapter_works.xml
@@ -25,7 +25,7 @@
<para>
The function blocks in more detail:
<variablelist>
- <varlistentry><term><command>GTK 1/2</command></term>
+ <varlistentry><term><command>GTK+ 2</command></term>
<listitem>
<para>
Handling of all user input/output (all windows, dialogs and such).
@@ -44,9 +44,8 @@
<varlistentry><term><command>Epan</command></term>
<listitem>
<para>
- Ethereal Packet ANalyzer (XXX - is this correct?) the packet
- analyzing engine. Source code can be found in the
- <filename>epan</filename> directory.
+ Ethereal Packet ANalyzer - the packet analyzing engine.
+ Source code can be found in the <filename>epan</filename> directory.
</para>
<itemizedlist>
<listitem>
@@ -62,8 +61,8 @@
</listitem>
<listitem>
<para>
- Plugins - Some of the protocol dissectors are implemented as plugins. Source
- code can be found at <filename>plugins</filename>.
+ Dissector-Plugins - Some of the protocol dissectors are implemented
+ as plugins. Source code can be found in <filename>plugins</filename>.
</para>
</listitem>
<listitem>
@@ -75,24 +74,33 @@
</itemizedlist>
</listitem>
</varlistentry>
+ <varlistentry><term><command>Wiretap</command></term>
+ <listitem>
+ <para>
+ The wiretap library is used to read/write capture files in libpcap
+ and a lot of other file formats. Source code in the
+ <filename>wiretap</filename> directory.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry><term><command>Capture</command></term>
<listitem>
<para>
- Capture engine.
+ The interface with the capture engine. Source code in the
+ root directory.
</para>
</listitem>
</varlistentry>
- <varlistentry><term><command>Wiretap</command></term>
+ <varlistentry><term><command>Dumpcap</command></term>
<listitem>
<para>
- The wiretap library is used to read/write capture files in libpcap
- and a lot of other file formats. Source code in the
- <filename>wiretap</filename> directory.
+ The capture engine itself. This is the only part that is to execute
+ with elevated privileges. Source code in the root directory.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><command>Win-/libpcap (not part of the Wireshark package)</command></term>
+ <term><command>WinPcap / libpcap (not part of the Wireshark package)</command></term>
<listitem>
<para>
The platform dependent packet capture library, including the capture
@@ -112,6 +120,12 @@
on your harddisk.
</para>
<para>
+ Since raw network adapter access requires elevated privileges these functions
+ are isolated into the dumpcap program. It's only this program that needs these
+ privileges, allowing the main part of the code (dissectors, user interface,
+ etc) to run as normal user program.
+ </para>
+ <para>
To hide all the lowlevel machine dependent details from
Wireshark, the libpcap/WinPcap (see <xref linkend="ChLibsPcap"/>) library
is used. This library provides a general purpose interface to capture