ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 13:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use '#' for host#port separator, document it. This fixes scp

Browse Source 
in multihop
This commit is contained in:
Matt Johnston 2013-04-17 22:48:43 +08:00
parent 54a76342f5
commit 3525cabf48
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli-runopts.c
View File

@ -610,7 +610,11 @@ static void parse_hostname(const char* orighostarg) {
cli_opts.username = m_strdup(cli_opts.own_user); cli_opts.username = m_strdup(cli_opts.own_user);
} }
port = strchr(cli_opts.remotehost, '#');
if (!port) {
// legacy separator
port = strchr(cli_opts.remotehost, '/'); port = strchr(cli_opts.remotehost, '/');
}
if (port) { if (port) {
*port = '\0'; *port = '\0';
cli_opts.remoteport = port+1; cli_opts.remoteport = port+1;

9
dbclient.1
View File

@ -15,7 +15,7 @@ dbclient \- lightweight SSH2 client
.B dbclient .B dbclient
[ [
.I args ] .I args ]
.I [user1]@host1[/port1],[user2]@host2[/port2],... .I [user1]@host1[#port1],[user2]@host2[#port2],...
.SH DESCRIPTION .SH DESCRIPTION
.B dbclient .B dbclient
@ -24,10 +24,9 @@ environments, while still being functional and secure enough for general use.
.SH OPTIONS .SH OPTIONS
.TP .TP
.B \-p \fIport .B \-p \fIport
Remote port. Connect to
Connect to port
.I port .I port
on the remote host. on the remote host. Alternatively a port can be specified as hostname#port.
Default is 22. Default is 22.
.TP .TP
.B \-i \fIidfile .B \-i \fIidfile
@ -127,7 +126,7 @@ Dropbear will also allow multiple "hops" to be specified, separated by commas. I
this case a connection will be made to the first host, then a TCP forwarded this case a connection will be made to the first host, then a TCP forwarded
connection will be made through that to the second host, and so on. Hosts other than connection will be made through that to the second host, and so on. Hosts other than
the final destination will not see anything other than the encrypted SSH stream. the final destination will not see anything other than the encrypted SSH stream.
A port for a host can be specified with a slash (eg matt@martello/44 ). A port for a host can be specified with a hash (eg matt@martello#44 ).
This syntax can also be used with scp or rsync (specifying dbclient as the This syntax can also be used with scp or rsync (specifying dbclient as the
ssh/rsh command). A file can be "bounced" through multiple SSH hops, eg ssh/rsh command). A file can be "bounced" through multiple SSH hops, eg