Support for capturing packet data from a pipe (a FIFO, or standard input).

capture.c :
- modified capture() to try to open an interface as a pipe if pcap_open_live()
  failed, and then read data in libpcap format from this pipe ;
- add new functions used by capture() : pipe_open_live() and pipe_dispatch()
  which are equivalents to the pcap_ functions.

libpcap.[ch] :
- moved the MAGIC and headers definitions from libpcap.c to libpcap.h
  because capture() now needs it.

svn path=/trunk/; revision=2181

1 files changed, 18 insertions, 16 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 5b5fef077d..7ad41d0ff9 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -101,9 +101,11 @@ Prints the version and options and exits.
 
 =item -i
 
-Sets the name of the network interface to use for live packet capture. 
-It should match one of the names listed in "B<netstat -i>" or
-"B<ifconfig -a>".
+Sets the name of the network interface or pipe to use for live packet capture.
+Network interface names should match one of the names listed in "B<netstat -i>"
+or "B<ifconfig -a>".
+Pipe names should be either the name of a FIFO (named pipe) or ``-'' to read
+data from the standard input. Data read from pipes must be in libpcap format.
 
 =item -k
 
@@ -532,19 +534,19 @@ The I<Capture Preferences> dialog lets you specify various parameters for
 capturing live packet data.
 
 The I<Interface:> combo box lets you specify the interface from which to
-capture packet data.  The I<Count:> entry specifies the number of
-packets to capture.  Entering 0 will capture packets indefinitely.  The
-I<Filter:> entry lets you specify the capture filter using a
-tcpdump-style filter string as described above.  The I<File:> entry
-specifies the file to save to, as in the I<Printer Options> dialog
-above.  You can specify the maximum number of bytes to capture per
-packet with the I<Capture length> entry, can specify that the display
-should be updated as packets are captured with the I<Update list of
-packets in real time> check box, can specify whether in such a capture
-the packet list pane should scroll to show the most recently captured
-packets with the I<Automatic scrolling in live capture> check box, and
-can specify whether addresses should be translated to names in the
-display with the I<Enable name resolution> check box.
+capture packet data, or the name of a FIFO from which to get the packet data.
+The I<Count:> entry specifies the number of packets to capture.  Entering 0
+will capture packets indefinitely.  The I<Filter:> entry lets you specify the
+capture filter using a tcpdump-style filter string as described above.  The
+I<File:> entry specifies the file to save to, as in the I<Printer Options>
+dialog above.  You can specify the maximum number of bytes to capture per
+packet with the I<Capture length> entry, can specify that the display should be
+updated as packets are captured with the I<Update list of packets in real time>
+check box, can specify whether in such a capture the packet list pane should
+scroll to show the most recently captured packets with the I<Automatic
+scrolling in live capture> check box, and can specify whether addresses should
+be translated to names in the display with the I<Enable name resolution> check
+box.
 
 =item Display Options