Add a "-p" command-line option, and a checkbox in the "Capture

Preferences" dialog box, to control whether to put the interface in
promiscuous mode or not; Debian bug #34376 asked for this.

svn path=/trunk/; revision=2439

2 files changed, 36 insertions, 13 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 02e0ea511c..ee19773e04 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -15,6 +15,7 @@ S<[ B<-k> ]>
 S<[ B<-m> font ]>
 S<[ B<-n> ]>
 S<[ B<-o> preference setting ] ...>
+S<[ B<-p> ]>
 S<[ B<-P> packet list height ]>
 S<[ B<-Q> ]>
 S<[ B<-r> infile ]>
@@ -126,6 +127,15 @@ form I<prefname>B<:>I<value>, where I<prefname> is the name of the
 preference (which is the same name that would appear in the preference
 file), and I<value> is the value to which it should be set.
 
+=item -p
+
+I<Don't> put the interface into promiscuous mode.  Note that the
+interface might be in promiscuous mode for some other reason; hence,
+B<-p> cannot be used to ensure that the only traffic that is captured is
+traffic sent to or from the machine on which B<Ethereal> is running,
+broadcast traffic, and multicast traffic to addresses received by that
+machine.
+
 =item -P
 
 Sets the initial height of the packet list (top) pane.
@@ -592,19 +602,22 @@ 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, 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.
+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 whether the interface is to be put in promiscuous mode or
+not with the I<Capture packets in promiscuous mode> check box, 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
 
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index b2c941f590..ffc8e8904c 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -13,6 +13,7 @@ S<[ B<-h> ]>
 S<[ B<-i> interface ]> 
 S<[ B<-n> ]>
 S<[ B<-o> preference setting ] ...>
+S<[ B<-p> ]>
 S<[ B<-r> infile ]>
 S<[ B<-R> filter expression ]>
 S<[ B<-s> snaplen ]>
@@ -137,6 +138,15 @@ form I<prefname>B<:>I<value>, where I<prefname> is the name of the
 preference (which is the same name that would appear in the preference
 file), and I<value> is the value to which it should be set.
 
+=item -p
+
+I<Don't> put the interface into promiscuous mode.  Note that the
+interface might be in promiscuous mode for some other reason; hence,
+B<-p> cannot be used to ensure that the only traffic that is captured is
+traffic sent to or from the machine on which B<Tethereal> is running,
+broadcast traffic, and multicast traffic to addresses received by that
+machine.
+
 =item -r
 
 Reads packet data from I<file>.