Skip to content

Commit 196110f

Browse files
committed
Documentation update for FallbackPort switch and to explicitly state that
hpnssh uses port 2222 as the default port. Files touched: hpnssh.1 hpnssh_config.5
1 parent ebcdb90 commit 196110f

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
1414
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1515

16-
AC_INIT([OpenSSH], [Portable], [[email protected]])
16+
AC_INIT([OpenSSH],[Portable],[[email protected]])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
AC_CONFIG_SRCDIR([ssh.c])
1919

hpnssh.1

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ X11 connections, arbitrary TCP ports and
7979
sockets can also be forwarded over the secure channel.
8080
.Nm
8181
is binary compatible with the more well known OpenSSH and uses the same configuration
82-
directives, methods, and keywords except where noted.
82+
directives, methods, and keywords except where noted with the exception of the default port.
83+
HPN-SSH servers, by default, use port 2222 for connection, and as such,
84+
.Nm
85+
clients
86+
attempt to connect on that port. If the connection attempt on port 2222 fails it will fallback to
87+
port 22. Please see the -p switch for more information.
8388
.Pp
8489
.Nm
8590
connects and logs into the specified
@@ -531,6 +536,7 @@ For full details of the options listed below, and their possible values, see
531536
.It EnableEscapeCommandline
532537
.It EscapeChar
533538
.It ExitOnForwardFailure
539+
.It FallbackPort
534540
.It FingerprintHash
535541
.It ForkAfterAuthentication
536542
.It ForwardAgent
@@ -607,7 +613,7 @@ For full details of the options listed below, and their possible values, see
607613
.It VisualHostKey
608614
.It XAuthLocation
609615
.Pp
610-
.It * Hpnssh specific configuration option.
616+
.It * Hpnssh specific configuration option.
611617
.El
612618
.Pp
613619
.It Fl P Ar tag
@@ -624,6 +630,13 @@ for more information.
624630
Port to connect to on the remote host.
625631
This can be specified on a
626632
per-host basis in the configuration file.
633+
HPN-SSH uses a default port of 2222. It will automatically
634+
fallback to use the SSH standard port 22 if it cannot connect
635+
on port 2222. This fallback behaviour can be modified with the
636+
FallbackPort option. Note: if outbound port 2222 is
637+
blocked it may appear that the hpnssh client is non-responsive. In that event,
638+
either specify the correct port or use the ConnectTimeout option
639+
to trigger the port fallback more quickly.
627640
.Pp
628641
.It Fl Q Ar query_option
629642
Queries for the algorithms supported by one of the following features:
@@ -1813,4 +1826,4 @@ protocol versions 1.5 and 2.0.
18131826
Chris Rapier, Michael Stevens, Ben Bennet, and Mike Tasota developed
18141827
the HPN extensions at the Pittsburgh Supercomuting Center with grants
18151828
from Cisco, the National Library of Medicine, and the National Science
1816-
Foundation.
1829+
Foundation.

hpnssh_config.5

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,11 +723,6 @@ If set to a time in seconds, or a time in any of the formats documented in
723723
then the backgrounded master connection will automatically terminate
724724
after it has remained idle (with no client connections) for the
725725
specified time.
726-
.It Cm DisableMTAES
727-
Switch the encryption cipher being used from the multithreaded MT-AES-CTR cipher
728-
back to the stock single-threaded AES-CTR cipher. This may prove to be more
729-
effcient in some circumstances. Default is
730-
.Cm no. HPNSSH only.
731726
.It Cm DynamicForward
732727
Specifies that a TCP port on the local machine be forwarded
733728
over the secure channel, and the application
@@ -813,6 +808,9 @@ The argument must be
813808
or
814809
.Cm no
815810
(the default).
811+
.It Cm FallbackPort
812+
Specifies the port hpnssh should try to connect to if it fails connecting to the
813+
default hpnsshd port of 2222. The default is port 22. HPN-SSH only.
816814
.It Cm FingerprintHash
817815
Specifies the hash algorithm used when displaying key fingerprints.
818816
Valid options are:

0 commit comments

Comments
 (0)