Skip to content

scp: avoid reconnecting to identical remote sources #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peripherium wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scp: avoid reconnecting to identical remote sources #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions scp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,12 +1019,13 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
{
char *suser = NULL, *host = NULL, *src = NULL;
char *bp, *tuser, *thost, *targ;
int sport = -1, tport = -1;
int sport = -1, tport = -1, next_sport = -1;
struct sftp_conn *conn = NULL, *conn2 = NULL;
arglist alist;
int i, r, status;
int i, r, status, k;
struct stat sb;
u_int j;
char *next_suser, *next_host;

memset(&alist, '\0', sizeof(alist));
alist.list = NULL;
Expand Down Expand Up @@ -1078,12 +1079,6 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
debug3_f("origin in %d out %d pid %ld",
remin, remout, (long)do_cmd_pid);
}
/*
* XXX remember suser/host/sport and only
* reconnect if they change between arguments.
* would save reconnections for cases like
* scp -3 hosta:/foo hosta:/bar hostb:
*/
/* Connect to origin now */
sftp_free(conn2);
conn2 = do_sftp_connect(host, suser,
Expand All @@ -1095,7 +1090,41 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
}
debug3_f("destination in %d out %d pid %ld",
remin2, remout2, (long)do_cmd_pid2);
throughlocal_sftp(conn2, conn, src, targ);

/* run while host and suser dont change */
k = 0;
while (i + k < argc - 1) {
throughlocal_sftp(conn2, conn, src, targ);
k++;
if (i + k >= argc - 1) {
break;
}
free(src);
r = parse_scp_uri(argv[i+k], &next_suser, &next_host,
&next_sport, &src);

if (r == -1) {
k--;
break;
}
if (r != 0)
parse_user_host_path(argv[i+k], &next_suser,
&next_host, &src);

if (next_host == NULL || ((next_suser != NULL && suser != NULL)
&& (strcmp(next_host, host) || strcmp(next_suser, suser)))
|| (suser == NULL) != (next_suser == NULL)
|| next_sport != sport) {

free(next_suser);
free(next_host);
k--;
break;
}
free(next_suser);
free(next_host);
}
i = i + k;
(void) close(remin2);
(void) close(remout2);
remin2 = remout2 = -1;
Expand Down
Loading