Update object export code:

 - Add to User's Guide
 - Add a help button
 - Move a lot of code into the shared export_object.c file and out of
   dissector specific file export_object_http.c.  This will make adding
   additional protocols much easier.
 - Change comment in packet-http.c to reflect new name (Export Object)
 - Various other minor improvements 


svn path=/trunk/; revision=20961

3 files changed, 83 insertions, 2 deletions

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index c1a9fa1203..e66d22eb63 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -247,11 +247,12 @@ FILE SECTION
   <!ENTITY WiresharkExportPSDialog SYSTEM "./wsug_graphics/ws-export-ps.png" NDATA PNG>
   <!ENTITY WiresharkExportPSMLDialog SYSTEM "./wsug_graphics/ws-export-psml.png" NDATA PNG>
   <!ENTITY WiresharkExportPDMLDialog SYSTEM "./wsug_graphics/ws-export-pdml.png" NDATA PNG>
-  <!ENTITY WiresharkExportSelectedDialog SYSTEM "./wsug_graphics/ws-export-selected.png" NDATA PNG>
+  <!ENTITY WiresharkExportSelectedDialog SYSTEM
+  "./wsug_graphics/ws-export-selected.png" NDATA PNG>
+  <!ENTITY WiresharkExportObjectsDialog SYSTEM "./wsug_graphics/ws-export-objects.png" NDATA PNG>
   <!ENTITY WiresharkPrint SYSTEM "./wsug_graphics/ws-print.png" NDATA PNG>
   <!ENTITY WiresharkPacketRangeFrame SYSTEM "./wsug_graphics/ws-packet-range.png" NDATA PNG>
   <!ENTITY WiresharkPacketFormatFrame SYSTEM "./wsug_graphics/ws-packet-format.png" NDATA PNG>
-
   <!-- Sixth Chapter -->
 
   <!-- Appendices etc -->
diff --git a/docbook/wsug_graphics/ws-export-objects.png b/docbook/wsug_graphics/ws-export-objects.png
new file mode 100644
index 0000000000..e61d85e82e
--- /dev/null
+++ b/docbook/wsug_graphics/ws-export-objects.png
diff --git a/docbook/wsug_src/WSUG_chapter_io.xml b/docbook/wsug_src/WSUG_chapter_io.xml
index 9256134976..0d693e1a06 100644
--- a/docbook/wsug_src/WSUG_chapter_io.xml
+++ b/docbook/wsug_src/WSUG_chapter_io.xml
@@ -939,6 +939,86 @@
 	</itemizedlist>	
 	  </para>
   </section>
+	<section id="ChIOExportObjectsDialog">
+	<title>The "Export Objects" dialog box</title>
+	  <para>
+	    This feature scans through HTTP streams in the currently
+	    open capture file or running capture and takes reassembled
+	    objects such as HTML documents, image files, executables
+	    and anything else that can be transferred over HTTP and
+	    lets you save them to disk.  If you have a capture
+	    running, this list is automatically updated every few
+	    seconds with any new objects seen.  The saved objects can then be
+	    opened with the proper viewer or executed in the case of
+	    executables (if it is for the same platform you are
+	    running Wireshark on) without any further work on your
+	    part.
+	  </para>
+    <figure>
+      <title>The "Export Objects" dialog box</title>
+      <graphic entityref="WiresharkExportObjectsDialog" format="PNG"/>
+    </figure>
+    
+	<itemizedlist>
+	  <para>Columns:</para>
+		<listitem><para>
+	  	<command>Packet num:</command> The packet number in
+	  	which this object was found.  In some cases, there can
+	  	be multiple objects in the same packet.
+		</para></listitem>
+
+		<listitem><para>
+		<command>Hostname:</command> The hostname of the
+		server that sent the object as a response to an HTTP request.
+		</para></listitem>
+
+		<listitem><para>
+		<command>Content Type:</command> The HTTP content type
+		of this object.
+		</para></listitem>
+
+		<listitem><para>
+		<command>Bytes:</command> The size of this object in bytes.
+		</para></listitem>
+
+		<listitem><para>
+		<command>Filename:</command> The final part of the URI
+		(after the last slash).  This is typically a filename,
+		but may be a long complex looking string, which
+		typically indicates that the file was received in response to
+		a HTTP POST request.
+		</para></listitem>
+	</itemizedlist>	
+
+	<itemizedlist>
+	  <para>Buttons:</para>
+		<listitem><para>
+	  	<command>Help:</command> Opens this section in the
+	  	user's guide.
+		</para></listitem>
+
+		<listitem><para>
+	  	<command>Close:</command> Closes this dialog.
+		</para></listitem>
+
+		<listitem><para>
+	  	<command>Save As:</command> Saves the currently
+	  	selected object as a filename you specify.  The
+	  	default filename to save as is taken from the filename
+	  	column of the objects list.
+		</para></listitem>
+
+		<listitem><para>
+	  	<command>Save All:</command> Saves all objects in the
+	  	list using the filename from the filename column.  You
+	  	will be asked what directory / folder to save them
+	  	in.  If	the filename is invalid for the operating system /
+	  	file system you are running Wireshark on, then an error
+	  	will appear and that object will not be saved (but all
+	  	of the others will be).
+		</para></listitem>
+	</itemizedlist>
+	</section>
   </section>
 
   <section id="ChIOPrintSection"><title>Printing packets</title>