From 99367fc51303224ec9e95e29a8407cd0d0b5d9f6 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Mon, 3 Oct 2016 16:19:01 +0200
Subject: sshdump: use tcpdump as default capture binary.

This removes the option to specify a custom capture binary due to
incompatibilities between different binaries options. A following
change will add the chance to use a custom capture command that
will cover all the cases that the default doesn't.

Bug: 12952
Change-Id: Idbde3e27f34c28f4ce622c3a860994e25ce5f92f
Reviewed-on: https://code.wireshark.org/review/18040
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
---
 doc/sshdump.pod | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'doc/sshdump.pod')

diff --git a/doc/sshdump.pod b/doc/sshdump.pod
index 627b023d6f..f3b7269c79 100644
--- a/doc/sshdump.pod
+++ b/doc/sshdump.pod
@@ -21,7 +21,6 @@ S<[ B<--remote-username>=E<lt>usernameE<gt> ]>
 S<[ B<--remote-password>=E<lt>passwordE<gt> ]>
 S<[ B<--sshkey>=E<lt>public key path<gt> ]>
 S<[ B<--remote-interface>=E<lt>interfaceE<gt> ]>
-S<[ B<--remote-capture-bin>=E<lt>capture binaryE<gt> ]>
 
 B<sshdump>
 S<B<--extcap-interfaces>>
@@ -42,7 +41,6 @@ S<B<--remote-host=myremotehost>>
 S<B<--remote-port=22>>
 S<B<--remote-username=user>>
 S<B<--remote-interface=eth2>>
-S<B<--remote-capture-bin=/usr/sbin/dumpcap>>
 
 =head1 DESCRIPTION
 
@@ -53,7 +51,7 @@ interface.
 
 The feature is functionally equivalent to run commands like
 
-$ ssh remoteuser@remotehost -p 22222 'dumpcap -i IFACE -P -w -' > FILE &
+$ ssh remoteuser@remotehost -p 22222 'tcpdump -U -i IFACE -w -' > FILE &
 $ wireshark FILE
 
 $ ssh remoteuser@remotehost '/sbin/dumpcap -i IFACE -P -w - -f "not port 22"' > FILE &
@@ -129,10 +127,6 @@ The path to a private key for authentication.
 
 The remote network interface to capture from.
 
-=item --remote-capture-bin=E<lt>capture binaryE<gt>
-
-The remote capture binary.
-
 =item --extcap-capture-filter=E<lt>capture filterE<gt>
 
 The capture filter
@@ -185,8 +179,6 @@ To see interface configuration options:
         {type=string}{tooltip=Passphrase to unlock the SSH private key}
     arg {number=6}{call=--remote-interface}{display=Remote interface}{type=string}{default=eth0}
         {tooltip=The remote network interface used for capture}
-    arg {number=7}{call=--remote-capture-bin}{display=Remote capture binary}{type=string}
-        {default=dumpcap}{tooltip=The remote dumpcap binary used for capture.}
     arg {number=8}{call=--remote-filter}{display=Remote capture filter}{type=string}
         {default=not ((host myip) and port 22)}{tooltip=The remote capture filter}
     arg {number=9}{call=--remote-count}{display=Packets to capture}{type=unsigned}{default=0}
@@ -201,7 +193,7 @@ NOTE: To stop capturing CTRL+C/kill/terminate application.
 
 =head1 SEE ALSO
 
-wireshark(1), tshark(1), dumpcap(1), extcap(4)
+wireshark(1), tshark(1), dumpcap(1), extcap(4), tcpdump(1)
 
 =head1 NOTES
 
-- 
cgit v1.2.3