2000-11-24 16:01:24 +03:00
|
|
|
/* $NetBSD: ftp.c,v 1.112 2000/11/24 13:01:24 itojun Exp $ */
|
1999-10-05 05:16:11 +04:00
|
|
|
|
|
|
|
/*-
|
2000-05-01 13:44:53 +04:00
|
|
|
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
|
1999-10-05 05:16:11 +04:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
|
|
* by Luke Mewburn.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the NetBSD
|
|
|
|
* Foundation, Inc. and its contributors.
|
|
|
|
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
|
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
|
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
/*
|
1999-10-01 03:51:26 +04:00
|
|
|
* Copyright (c) 1985, 1989, 1993, 1994
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
1999-07-02 12:07:40 +04:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
1999-10-01 03:51:26 +04:00
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
1999-07-02 12:07:40 +04:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
1999-10-01 03:51:26 +04:00
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
1999-07-02 12:07:40 +04:00
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
1999-10-01 03:51:26 +04:00
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
1999-07-02 12:07:40 +04:00
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
1995-09-08 05:05:59 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
1999-10-01 03:51:26 +04:00
|
|
|
* Copyright (C) 1997 and 1998 WIDE Project.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
1993-03-21 12:45:37 +03:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
1999-10-01 03:51:26 +04:00
|
|
|
* 3. Neither the name of the project nor the names of its contributors
|
1993-03-21 12:45:37 +03:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
1999-10-01 03:51:26 +04:00
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
1993-03-21 12:45:37 +03:00
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
1999-10-01 03:51:26 +04:00
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
1993-03-21 12:45:37 +03:00
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
1997-07-20 13:45:35 +04:00
|
|
|
#include <sys/cdefs.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#ifndef lint
|
1995-09-08 05:05:59 +04:00
|
|
|
#if 0
|
|
|
|
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
|
|
|
|
#else
|
2000-11-24 16:01:24 +03:00
|
|
|
__RCSID("$NetBSD: ftp.c,v 1.112 2000/11/24 13:01:24 itojun Exp $");
|
1995-09-08 05:05:59 +04:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif /* not lint */
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
#include <sys/types.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/socket.h>
|
1998-05-20 04:54:52 +04:00
|
|
|
#include <sys/time.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/ip.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <arpa/inet.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <arpa/ftp.h>
|
|
|
|
#include <arpa/telnet.h>
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <err.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#include <errno.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <netdb.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
1998-04-02 01:07:03 +04:00
|
|
|
#include <time.h>
|
1994-08-25 07:47:50 +04:00
|
|
|
#include <unistd.h>
|
1997-03-13 09:23:11 +03:00
|
|
|
#include <stdarg.h>
|
2000-07-30 10:10:43 +04:00
|
|
|
#ifndef USE_SELECT
|
1999-06-24 18:50:56 +04:00
|
|
|
#include <poll.h>
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#include "ftp_var.h"
|
|
|
|
|
1999-10-05 04:54:07 +04:00
|
|
|
volatile int abrtflag = 0;
|
|
|
|
volatile int timeoutflag = 0;
|
1999-10-11 02:33:54 +04:00
|
|
|
sigjmp_buf ptabort;
|
1994-08-25 07:47:50 +04:00
|
|
|
int ptabflg;
|
1993-03-21 12:45:37 +03:00
|
|
|
int ptflag = 0;
|
1999-10-01 10:55:44 +04:00
|
|
|
char pasv[BUFSIZ]; /* passive port for proxy data connection */
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2000-05-01 14:35:16 +04:00
|
|
|
static int empty(FILE *, FILE *, int);
|
1999-06-24 18:50:56 +04:00
|
|
|
|
2000-07-30 10:10:43 +04:00
|
|
|
struct sockinet {
|
|
|
|
union sockunion {
|
|
|
|
struct sockaddr_in su_sin;
|
1999-09-21 17:17:22 +04:00
|
|
|
#ifdef INET6
|
2000-07-30 10:10:43 +04:00
|
|
|
struct sockaddr_in6 su_sin6;
|
1999-09-21 17:17:22 +04:00
|
|
|
#endif
|
2000-07-30 10:10:43 +04:00
|
|
|
} si_su;
|
2000-08-02 02:47:25 +04:00
|
|
|
#if !HAVE_SOCKADDR_SA_LEN
|
2000-07-30 10:10:43 +04:00
|
|
|
int si_len;
|
1999-09-21 17:17:22 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
};
|
1999-07-11 00:46:42 +04:00
|
|
|
|
2000-08-02 02:47:25 +04:00
|
|
|
#if !HAVE_SOCKADDR_SA_LEN
|
2000-07-30 10:10:43 +04:00
|
|
|
# define su_len si_len
|
|
|
|
#else
|
|
|
|
# define su_len si_su.su_sin.sin_len
|
|
|
|
#endif
|
|
|
|
#define su_family si_su.su_sin.sin_family
|
|
|
|
#define su_port si_su.su_sin.sin_port
|
1999-07-02 12:07:40 +04:00
|
|
|
|
2000-07-30 10:10:43 +04:00
|
|
|
struct sockinet myctladdr, hisctladdr, data_addr;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
char *
|
2000-05-01 14:35:16 +04:00
|
|
|
hookup(char *host, char *port)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2000-08-06 12:51:22 +04:00
|
|
|
int s = -1, len, error, portnum;
|
1999-07-03 09:44:11 +04:00
|
|
|
struct addrinfo hints, *res, *res0;
|
1999-07-02 12:07:40 +04:00
|
|
|
char hbuf[MAXHOSTNAMELEN];
|
1999-08-30 02:21:57 +04:00
|
|
|
static char hostnamebuf[MAXHOSTNAMELEN];
|
1999-07-03 09:44:11 +04:00
|
|
|
char *cause = "unknown";
|
2000-08-06 12:51:22 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
memset((char *)&hisctladdr, 0, sizeof (hisctladdr));
|
2000-07-31 04:56:07 +04:00
|
|
|
memset((char *)&myctladdr, 0, sizeof (myctladdr));
|
1999-07-02 12:07:40 +04:00
|
|
|
memset(&hints, 0, sizeof(hints));
|
2000-08-06 12:51:22 +04:00
|
|
|
portnum = parseport(port, FTP_PORT);
|
1999-07-02 12:07:40 +04:00
|
|
|
hints.ai_flags = AI_CANONNAME;
|
|
|
|
hints.ai_family = AF_UNSPEC;
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
hints.ai_protocol = 0;
|
2000-08-06 12:51:22 +04:00
|
|
|
error = getaddrinfo(host, NULL, &hints, &res0);
|
1999-07-02 12:07:40 +04:00
|
|
|
if (error) {
|
2000-07-07 19:10:32 +04:00
|
|
|
warnx("%s", gai_strerror(error));
|
1999-07-02 12:07:40 +04:00
|
|
|
code = -1;
|
|
|
|
return (0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1999-07-03 09:44:11 +04:00
|
|
|
if (res0->ai_canonname)
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(hostnamebuf, res0->ai_canonname,
|
|
|
|
sizeof(hostnamebuf));
|
1999-07-02 12:07:40 +04:00
|
|
|
else
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(hostnamebuf, host, sizeof(hostnamebuf));
|
1993-03-21 12:45:37 +03:00
|
|
|
hostname = hostnamebuf;
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1999-07-03 09:44:11 +04:00
|
|
|
for (res = res0; res; res = res->ai_next) {
|
2000-05-29 18:57:27 +04:00
|
|
|
/*
|
|
|
|
* make sure that ai_addr is NOT an IPv4 mapped address.
|
|
|
|
* IPv4 mapped address complicates too many things in FTP
|
|
|
|
* protocol handling, as FTP protocol is defined differently
|
|
|
|
* between IPv4 and IPv6.
|
2000-05-30 06:11:42 +04:00
|
|
|
*
|
|
|
|
* This may not be the best way to handle this situation,
|
|
|
|
* since the semantics of IPv4 mapped address is defined in
|
|
|
|
* the kernel. There are configurations where we should use
|
|
|
|
* IPv4 mapped address as native IPv6 address, not as
|
|
|
|
* "an IPv6 address that embeds IPv4 address" (namely, SIIT).
|
|
|
|
*
|
|
|
|
* More complete solution would be to have an additional
|
|
|
|
* getsockopt to grab "real" peername/sockname. "real"
|
|
|
|
* peername/sockname will be AF_INET if IPv4 mapped address
|
|
|
|
* is used to embed IPv4 address, and will be AF_INET6 if
|
|
|
|
* we use it as native. What a mess!
|
2000-05-29 18:57:27 +04:00
|
|
|
*/
|
|
|
|
ai_unmapped(res);
|
1999-07-03 09:44:11 +04:00
|
|
|
#if 0 /*old behavior*/
|
|
|
|
if (res != res0) /* not on the first address */
|
|
|
|
#else
|
|
|
|
if (res0->ai_next) /* if we have multiple possibilities */
|
|
|
|
#endif
|
|
|
|
{
|
2000-11-24 16:01:24 +03:00
|
|
|
if (getnameinfo(res->ai_addr, res->ai_addrlen,
|
|
|
|
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST))
|
|
|
|
strlcpy(hbuf, "?", sizeof(hbuf));
|
1999-07-02 12:07:40 +04:00
|
|
|
fprintf(ttyout, "Trying %s...\n", hbuf);
|
1999-07-03 09:44:11 +04:00
|
|
|
}
|
2000-08-06 12:51:22 +04:00
|
|
|
((struct sockaddr_in *)res->ai_addr)->sin_port = htons(portnum);
|
2000-09-28 16:29:23 +04:00
|
|
|
s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
|
1999-07-03 09:44:11 +04:00
|
|
|
if (s < 0) {
|
|
|
|
cause = "socket";
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
while ((error = xconnect(s, res->ai_addr, res->ai_addrlen)) < 0
|
|
|
|
&& errno == EINTR) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
if (error) {
|
|
|
|
/* this "if" clause is to prevent print warning twice */
|
|
|
|
if (res->ai_next) {
|
2000-11-24 16:01:24 +03:00
|
|
|
if (getnameinfo(res->ai_addr, res->ai_addrlen,
|
2000-07-31 04:56:07 +04:00
|
|
|
hbuf, sizeof(hbuf), NULL, 0,
|
2000-11-24 16:01:24 +03:00
|
|
|
NI_NUMERICHOST))
|
|
|
|
strlcpy(hbuf, "?", sizeof(hbuf));
|
1999-07-03 09:44:11 +04:00
|
|
|
warn("connect to address %s", hbuf);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-07-03 09:44:11 +04:00
|
|
|
cause = "connect";
|
|
|
|
close(s);
|
|
|
|
s = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
continue;
|
|
|
|
}
|
1999-07-03 09:44:11 +04:00
|
|
|
|
|
|
|
/* finally we got one */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (s < 0) {
|
2000-07-07 19:10:32 +04:00
|
|
|
warn("%s", cause);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1999-07-03 09:49:57 +04:00
|
|
|
freeaddrinfo(res0);
|
1999-07-03 09:44:11 +04:00
|
|
|
return 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2000-07-30 10:10:43 +04:00
|
|
|
memcpy(&hisctladdr.si_su, res->ai_addr, res->ai_addrlen);
|
|
|
|
hisctladdr.su_len = res->ai_addrlen;
|
1999-07-03 09:44:11 +04:00
|
|
|
freeaddrinfo(res0);
|
|
|
|
res0 = res = NULL;
|
1999-08-30 02:21:57 +04:00
|
|
|
|
2000-07-30 13:32:09 +04:00
|
|
|
len = hisctladdr.su_len;
|
2000-07-30 10:10:43 +04:00
|
|
|
if (getsockname(s, (struct sockaddr *)&myctladdr.si_su, &len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("getsockname");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
2000-07-30 13:32:09 +04:00
|
|
|
myctladdr.su_len = len;
|
1999-08-30 02:21:57 +04:00
|
|
|
|
2000-02-28 13:12:27 +03:00
|
|
|
#ifdef IPTOS_LOWDELAY
|
2000-07-30 10:10:43 +04:00
|
|
|
if (hisctladdr.su_family == AF_INET) {
|
1999-07-11 04:41:59 +04:00
|
|
|
int tos = IPTOS_LOWDELAY;
|
1999-07-02 12:07:40 +04:00
|
|
|
if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
2000-02-28 13:12:27 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
cin = fdopen(s, "r");
|
|
|
|
cout = fdopen(s, "w");
|
|
|
|
if (cin == NULL || cout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warnx("fdopen failed.");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cin)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cin);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cout)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (verbose)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "Connected to %s.\n", hostname);
|
1999-11-11 04:19:11 +03:00
|
|
|
if (getreply(0) > 2) { /* read startup message from server */
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cin)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cin);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cout)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
{
|
|
|
|
int on = 1;
|
|
|
|
|
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))
|
|
|
|
< 0 && debug) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt");
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (hostname);
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
bad:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(s);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
cmdabort(int notused)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1999-10-12 10:04:59 +04:00
|
|
|
if (fromatty)
|
|
|
|
write(fileno(ttyout), "\n", 1);
|
1993-03-21 12:45:37 +03:00
|
|
|
abrtflag++;
|
|
|
|
if (ptflag)
|
1999-10-09 07:00:55 +04:00
|
|
|
siglongjmp(ptabort, 1);
|
|
|
|
errno = oerrno;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1999-10-05 04:54:07 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
cmdtimeout(int notused)
|
1999-10-05 04:54:07 +04:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
1999-10-05 04:54:07 +04:00
|
|
|
|
|
|
|
alarmtimer(0);
|
1999-10-12 10:04:59 +04:00
|
|
|
if (fromatty)
|
|
|
|
write(fileno(ttyout), "\n", 1);
|
1999-10-05 04:54:07 +04:00
|
|
|
timeoutflag++;
|
|
|
|
if (ptflag)
|
1999-10-09 07:00:55 +04:00
|
|
|
siglongjmp(ptabort, 1);
|
|
|
|
errno = oerrno;
|
1999-10-05 04:54:07 +04:00
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*VARARGS*/
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
1997-03-13 09:23:11 +03:00
|
|
|
command(const char *fmt, ...)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int r;
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldsigint;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
if (debug) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("---> ", ttyout);
|
1997-03-13 09:23:11 +03:00
|
|
|
va_start(ap, fmt);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (strncmp("PASS ", fmt, 5) == 0)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("PASS XXXX", ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
else if (strncmp("ACCT ", fmt, 5) == 0)
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("ACCT XXXX", ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
else
|
1998-06-04 12:28:35 +04:00
|
|
|
vfprintf(ttyout, fmt, ap);
|
1993-03-21 12:45:37 +03:00
|
|
|
va_end(ap);
|
1998-06-04 12:28:35 +04:00
|
|
|
putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (cout == NULL) {
|
1997-03-13 09:23:11 +03:00
|
|
|
warnx("No control connection for command.");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
|
|
|
return (0);
|
|
|
|
}
|
1999-10-05 04:54:07 +04:00
|
|
|
|
|
|
|
abrtflag = 0;
|
|
|
|
|
|
|
|
oldsigint = xsignal(SIGINT, cmdabort);
|
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
va_start(ap, fmt);
|
1993-03-21 12:45:37 +03:00
|
|
|
vfprintf(cout, fmt, ap);
|
|
|
|
va_end(ap);
|
1997-03-13 09:23:11 +03:00
|
|
|
fputs("\r\n", cout);
|
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
cpend = 1;
|
|
|
|
r = getreply(!strcmp(fmt, "QUIT"));
|
1999-10-05 04:54:07 +04:00
|
|
|
if (abrtflag && oldsigint != SIG_IGN)
|
|
|
|
(*oldsigint)(SIGINT);
|
|
|
|
(void)xsignal(SIGINT, oldsigint);
|
1994-08-25 07:47:50 +04:00
|
|
|
return (r);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
getreply(int expecteof)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1996-12-06 05:06:46 +03:00
|
|
|
char current_line[BUFSIZ]; /* last line of previous reply */
|
|
|
|
int c, n, line;
|
1994-08-25 07:47:50 +04:00
|
|
|
int dig;
|
1993-03-21 12:45:37 +03:00
|
|
|
int originalcode = 0, continuation = 0;
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldsigint, oldsigalrm;
|
1993-03-21 12:45:37 +03:00
|
|
|
int pflag = 0;
|
1994-08-25 07:47:50 +04:00
|
|
|
char *cp, *pt = pasv;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1999-10-05 04:54:07 +04:00
|
|
|
abrtflag = 0;
|
|
|
|
timeoutflag = 0;
|
|
|
|
|
|
|
|
oldsigint = xsignal(SIGINT, cmdabort);
|
|
|
|
oldsigalrm = xsignal(SIGALRM, cmdtimeout);
|
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
for (line = 0 ;; line++) {
|
1993-03-21 12:45:37 +03:00
|
|
|
dig = n = code = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
cp = current_line;
|
1999-10-05 04:54:07 +04:00
|
|
|
while (alarmtimer(60),((c = getc(cin)) != '\n')) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (c == IAC) { /* handle telnet commands */
|
|
|
|
switch (c = getc(cin)) {
|
|
|
|
case WILL:
|
|
|
|
case WONT:
|
|
|
|
c = getc(cin);
|
|
|
|
fprintf(cout, "%c%c%c", IAC, DONT, c);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
case DO:
|
|
|
|
case DONT:
|
|
|
|
c = getc(cin);
|
|
|
|
fprintf(cout, "%c%c%c", IAC, WONT, c);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
dig++;
|
|
|
|
if (c == EOF) {
|
1999-10-05 04:54:07 +04:00
|
|
|
/*
|
|
|
|
* these will get trashed by pswitch()
|
|
|
|
* in lostpeer()
|
|
|
|
*/
|
|
|
|
int reply_timeoutflag = timeoutflag;
|
|
|
|
int reply_abrtflag = abrtflag;
|
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
alarmtimer(0);
|
|
|
|
if (expecteof && feof(cin)) {
|
1999-10-05 04:54:07 +04:00
|
|
|
(void)xsignal(SIGINT, oldsigint);
|
|
|
|
(void)xsignal(SIGALRM, oldsigalrm);
|
1993-03-21 12:45:37 +03:00
|
|
|
code = 221;
|
|
|
|
return (0);
|
|
|
|
}
|
1999-10-24 16:31:36 +04:00
|
|
|
cpend = 0;
|
|
|
|
lostpeer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (verbose) {
|
1999-10-05 04:54:07 +04:00
|
|
|
if (reply_timeoutflag)
|
|
|
|
fputs(
|
1999-10-24 16:31:36 +04:00
|
|
|
"421 Service not available, remote server timed out. Connection closed\n",
|
|
|
|
ttyout);
|
1999-10-05 04:54:07 +04:00
|
|
|
else if (reply_abrtflag)
|
|
|
|
fputs(
|
1999-10-24 16:31:36 +04:00
|
|
|
"421 Service not available, user interrupt. Connection closed.\n",
|
|
|
|
ttyout);
|
1999-10-05 04:54:07 +04:00
|
|
|
else
|
|
|
|
fputs(
|
|
|
|
"421 Service not available, remote server has closed connection.\n",
|
1999-10-24 16:31:36 +04:00
|
|
|
ttyout);
|
1999-10-05 04:54:07 +04:00
|
|
|
(void)fflush(ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
code = 421;
|
1999-10-05 04:54:07 +04:00
|
|
|
(void)xsignal(SIGINT, oldsigint);
|
|
|
|
(void)xsignal(SIGALRM, oldsigalrm);
|
1994-08-25 07:47:50 +04:00
|
|
|
return (4);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c != '\r' && (verbose > 0 ||
|
1998-06-04 12:28:35 +04:00
|
|
|
((verbose > -1 && n == '5' && dig > 4) &&
|
|
|
|
(((!n && c < '5') || (n && n < '5'))
|
|
|
|
|| !retry_connect)))) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (proxflag &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(dig == 1 || (dig == 5 && verbose == 0)))
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "%s:", hostname);
|
|
|
|
(void)putc(c, ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (dig < 4 && isdigit(c))
|
|
|
|
code = code * 10 + (c - '0');
|
1999-07-02 12:07:40 +04:00
|
|
|
if (!pflag && (code == 227 || code == 228))
|
1993-03-21 12:45:37 +03:00
|
|
|
pflag = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
else if (!pflag && code == 229)
|
|
|
|
pflag = 100;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dig > 4 && pflag == 1 && isdigit(c))
|
|
|
|
pflag = 2;
|
|
|
|
if (pflag == 2) {
|
|
|
|
if (c != '\r' && c != ')')
|
|
|
|
*pt++ = c;
|
|
|
|
else {
|
|
|
|
*pt = '\0';
|
|
|
|
pflag = 3;
|
|
|
|
}
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (pflag == 100 && c == '(')
|
|
|
|
pflag = 2;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dig == 4 && c == '-') {
|
|
|
|
if (continuation)
|
|
|
|
code = 0;
|
|
|
|
continuation++;
|
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
n = c;
|
1996-12-06 05:06:46 +03:00
|
|
|
if (cp < ¤t_line[sizeof(current_line) - 1])
|
1993-03-21 12:45:37 +03:00
|
|
|
*cp++ = c;
|
|
|
|
}
|
1998-06-04 12:28:35 +04:00
|
|
|
if (verbose > 0 || ((verbose > -1 && n == '5') &&
|
|
|
|
(n < '5' || !retry_connect))) {
|
|
|
|
(void)putc(c, ttyout);
|
|
|
|
(void)fflush (ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
if (cp[-1] == '\r')
|
|
|
|
cp[-1] = '\0';
|
|
|
|
*cp = '\0';
|
|
|
|
if (line == 0)
|
|
|
|
(void)strlcpy(reply_string, current_line,
|
|
|
|
sizeof(reply_string));
|
|
|
|
if (line > 0 && code == 0 && reply_callback != NULL)
|
|
|
|
(*reply_callback)(current_line);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (continuation && code != originalcode) {
|
|
|
|
if (originalcode == 0)
|
|
|
|
originalcode = code;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (n != '1')
|
|
|
|
cpend = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
alarmtimer(0);
|
1999-10-05 04:54:07 +04:00
|
|
|
(void)xsignal(SIGINT, oldsigint);
|
|
|
|
(void)xsignal(SIGALRM, oldsigalrm);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (code == 421 || originalcode == 421)
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
1999-10-05 04:54:07 +04:00
|
|
|
if (abrtflag && oldsigint != cmdabort && oldsigint != SIG_IGN)
|
|
|
|
(*oldsigint)(SIGINT);
|
|
|
|
if (timeoutflag && oldsigalrm != cmdtimeout &&
|
|
|
|
oldsigalrm != SIG_IGN)
|
|
|
|
(*oldsigalrm)(SIGINT);
|
1993-03-21 12:45:37 +03:00
|
|
|
return (n - '0');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-06-24 18:50:56 +04:00
|
|
|
static int
|
2000-05-01 14:35:16 +04:00
|
|
|
empty(FILE *cin, FILE *din, int sec)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-06-24 18:50:56 +04:00
|
|
|
int nr;
|
|
|
|
int nfd = 0;
|
|
|
|
|
2000-07-30 10:10:43 +04:00
|
|
|
#ifdef USE_SELECT
|
1993-03-21 12:45:37 +03:00
|
|
|
struct timeval t;
|
1999-06-24 18:50:56 +04:00
|
|
|
fd_set rmask;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1999-09-30 10:35:13 +04:00
|
|
|
FD_ZERO(&rmask);
|
1999-06-24 18:50:56 +04:00
|
|
|
if (cin) {
|
|
|
|
if (nfd < fileno(cin))
|
|
|
|
nfd = fileno(cin);
|
|
|
|
FD_SET(fileno(cin), &rmask);
|
|
|
|
}
|
|
|
|
if (din) {
|
|
|
|
if (nfd < fileno(din))
|
|
|
|
nfd = fileno(din);
|
|
|
|
FD_SET(fileno(din), &rmask);
|
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
t.tv_sec = (long) sec;
|
|
|
|
t.tv_usec = 0;
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nr = select(nfd, &rmask, NULL, NULL, &t)) <= 0)
|
|
|
|
return nr;
|
|
|
|
|
|
|
|
nr = 0;
|
|
|
|
if (cin)
|
|
|
|
nr |= FD_ISSET(fileno(cin), &rmask) ? 1 : 0;
|
|
|
|
if (din)
|
|
|
|
nr |= FD_ISSET(fileno(din), &rmask) ? 2 : 0;
|
|
|
|
|
|
|
|
#else
|
|
|
|
struct pollfd pfd[2];
|
|
|
|
|
|
|
|
if (cin) {
|
|
|
|
pfd[nfd].fd = fileno(cin);
|
|
|
|
pfd[nfd++].events = POLLIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (din) {
|
|
|
|
pfd[nfd].fd = fileno(din);
|
|
|
|
pfd[nfd++].events = POLLIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((nr = poll(pfd, nfd, sec * 1000)) <= 0)
|
|
|
|
return nr;
|
|
|
|
|
|
|
|
nr = 0;
|
|
|
|
nfd = 0;
|
|
|
|
if (cin)
|
|
|
|
nr |= (pfd[nfd++].revents & POLLIN) ? 1 : 0;
|
|
|
|
if (din)
|
|
|
|
nr |= (pfd[nfd++].revents & POLLIN) ? 2 : 0;
|
|
|
|
#endif
|
|
|
|
return nr;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1999-10-11 02:33:54 +04:00
|
|
|
sigjmp_buf xferabort;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
abortxfer(int notused)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
char msgbuf[100];
|
|
|
|
int len;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
mflag = 0;
|
|
|
|
abrtflag = 0;
|
1999-10-09 07:00:55 +04:00
|
|
|
switch (direction[0]) {
|
|
|
|
case 'r':
|
|
|
|
strlcpy(msgbuf, "\nreceive", sizeof(msgbuf));
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
strlcpy(msgbuf, "\nsend", sizeof(msgbuf));
|
|
|
|
break;
|
|
|
|
default:
|
1999-10-24 16:31:36 +04:00
|
|
|
errx(1, "abortxfer called with unknown direction `%s'",
|
1999-10-09 07:00:55 +04:00
|
|
|
direction);
|
|
|
|
}
|
1999-10-24 16:31:36 +04:00
|
|
|
len = strlcat(msgbuf, " aborted. Waiting for remote to finish abort.\n",
|
1999-10-09 07:00:55 +04:00
|
|
|
sizeof(msgbuf));
|
|
|
|
write(fileno(ttyout), msgbuf, len);
|
|
|
|
siglongjmp(xferabort, 1);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
sendrequest(const char *cmd, const char *local, const char *remote,
|
|
|
|
int printnames)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
struct stat st;
|
1994-08-25 07:47:50 +04:00
|
|
|
int c, d;
|
1997-07-20 13:45:35 +04:00
|
|
|
FILE *fin, *dout;
|
2000-05-01 14:35:16 +04:00
|
|
|
int (*closefunc)(FILE *);
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldintr, oldintp;
|
1997-07-20 13:45:35 +04:00
|
|
|
volatile off_t hashbytes;
|
1999-09-22 11:18:31 +04:00
|
|
|
char *lmode, *bufp;
|
|
|
|
static size_t bufsize;
|
|
|
|
static char *buf;
|
1997-03-13 09:23:11 +03:00
|
|
|
int oprogress;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&fin;
|
|
|
|
(void)&dout;
|
|
|
|
(void)&closefunc;
|
|
|
|
(void)&oldintr;
|
|
|
|
(void)&oldintp;
|
|
|
|
(void)&lmode;
|
|
|
|
#endif
|
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
hashbytes = mark;
|
1996-11-25 08:13:18 +03:00
|
|
|
direction = "sent";
|
1997-07-20 13:45:35 +04:00
|
|
|
dout = NULL;
|
1996-11-25 08:13:18 +03:00
|
|
|
bytes = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
oprogress = progress;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (verbose && printnames) {
|
|
|
|
if (local && *local != '-')
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s ", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (remote)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "remote: %s\n", remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy) {
|
|
|
|
proxtrans(cmd, local, remote);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (curtype != type)
|
|
|
|
changetype(type, 0);
|
|
|
|
closefunc = NULL;
|
|
|
|
oldintr = NULL;
|
|
|
|
oldintp = NULL;
|
|
|
|
lmode = "w";
|
1999-10-09 07:00:55 +04:00
|
|
|
if (sigsetjmp(xferabort, 1)) {
|
1999-10-24 16:31:36 +04:00
|
|
|
while (cpend)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-06 02:04:30 +04:00
|
|
|
(void)xsignal(SIGQUIT, psummary);
|
1999-10-09 07:00:55 +04:00
|
|
|
oldintr = xsignal(SIGINT, abortxfer);
|
1997-03-13 09:23:11 +03:00
|
|
|
if (strcmp(local, "-") == 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
fin = stdin;
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
|
|
|
} else if (*local == '|') {
|
1999-09-28 03:09:42 +04:00
|
|
|
oldintp = xsignal(SIGPIPE, SIG_IGN);
|
1993-03-21 12:45:37 +03:00
|
|
|
fin = popen(local + 1, "r");
|
|
|
|
if (fin == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("%s", local + 1);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
closefunc = pclose;
|
|
|
|
} else {
|
|
|
|
fin = fopen(local, "r");
|
|
|
|
if (fin == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
closefunc = fclose;
|
1997-10-19 23:09:05 +04:00
|
|
|
if (fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "%s: not a plain file.\n", local);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = st.st_size;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (initconn()) {
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-09 07:00:55 +04:00
|
|
|
if (sigsetjmp(xferabort, 1))
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
|
|
|
|
if (restart_point &&
|
|
|
|
(strcmp(cmd, "STOR") == 0 || strcmp(cmd, "APPE") == 0)) {
|
1994-08-25 07:47:50 +04:00
|
|
|
int rc;
|
|
|
|
|
1997-01-19 17:19:02 +03:00
|
|
|
rc = -1;
|
1994-08-25 07:47:50 +04:00
|
|
|
switch (curtype) {
|
|
|
|
case TYPE_A:
|
|
|
|
rc = fseek(fin, (long) restart_point, SEEK_SET);
|
|
|
|
break;
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
|
|
|
rc = lseek(fileno(fin), restart_point, SEEK_SET);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (rc < 0) {
|
|
|
|
warn("local: %s", local);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2000-08-02 02:47:25 +04:00
|
|
|
if (command("REST " LLF, (LLT)restart_point) != CONTINUE)
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
lmode = "r+w";
|
|
|
|
}
|
|
|
|
if (remote) {
|
1999-10-24 16:31:36 +04:00
|
|
|
if (command("%s %s", cmd, remote) != PRELIM)
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1999-10-24 16:31:36 +04:00
|
|
|
} else {
|
|
|
|
if (command("%s", cmd) != PRELIM)
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1999-10-24 16:31:36 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
dout = dataconn(lmode);
|
|
|
|
if (dout == NULL)
|
|
|
|
goto abort;
|
1999-09-22 11:18:31 +04:00
|
|
|
|
|
|
|
if (sndbuf_size > bufsize) {
|
|
|
|
if (buf)
|
|
|
|
(void)free(buf);
|
|
|
|
bufsize = sndbuf_size;
|
|
|
|
buf = xmalloc(bufsize);
|
|
|
|
}
|
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
progressmeter(-1);
|
1999-09-28 03:09:42 +04:00
|
|
|
oldintp = xsignal(SIGPIPE, SIG_IGN);
|
1999-09-22 11:18:31 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
switch (curtype) {
|
|
|
|
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
1999-12-11 05:02:21 +03:00
|
|
|
if (rate_put) { /* rate limited */
|
|
|
|
while (1) {
|
|
|
|
struct timeval then, now, td;
|
|
|
|
off_t bufrem;
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
|
1999-09-21 17:17:22 +04:00
|
|
|
(void)gettimeofday(&then, NULL);
|
1999-12-11 05:02:21 +03:00
|
|
|
errno = c = d = 0;
|
|
|
|
bufrem = rate_put;
|
|
|
|
while (bufrem > 0) {
|
|
|
|
if ((c = read(fileno(fin), buf,
|
|
|
|
MIN(bufsize, bufrem))) <= 0)
|
|
|
|
goto senddone;
|
|
|
|
bytes += c;
|
|
|
|
bufrem -= c;
|
|
|
|
for (bufp = buf; c > 0;
|
|
|
|
c -= d, bufp += d)
|
|
|
|
if ((d = write(fileno(dout),
|
|
|
|
bufp, c)) <= 0)
|
|
|
|
break;
|
|
|
|
if (d < 0)
|
|
|
|
goto senddone;
|
|
|
|
if (hash &&
|
|
|
|
(!progress || filesize < 0) ) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (1) {
|
|
|
|
(void)gettimeofday(&now, NULL);
|
|
|
|
timersub(&now, &then, &td);
|
|
|
|
if (td.tv_sec > 0)
|
|
|
|
break;
|
|
|
|
usleep(1000000 - td.tv_usec);
|
|
|
|
}
|
|
|
|
}
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
} else { /* simpler/faster; no rate limit */
|
1999-12-11 05:02:21 +03:00
|
|
|
while (1) {
|
|
|
|
errno = c = d = 0;
|
|
|
|
if ((c = read(fileno(fin), buf, bufsize)) <= 0)
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
goto senddone;
|
|
|
|
bytes += c;
|
|
|
|
for (bufp = buf; c > 0; c -= d, bufp += d)
|
|
|
|
if ((d = write(fileno(dout), bufp, c))
|
|
|
|
<= 0)
|
|
|
|
break;
|
|
|
|
if (d < 0)
|
|
|
|
goto senddone;
|
|
|
|
if (hash && (!progress || filesize < 0) ) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
senddone:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0) && bytes > 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (bytes < mark)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (d < 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netout");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_A:
|
|
|
|
while ((c = getc(fin)) != EOF) {
|
|
|
|
if (c == '\n') {
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
while (hash && (!progress || filesize < 0) &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(bytes >= hashbytes)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)fflush(ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
hashbytes += mark;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(dout))
|
|
|
|
break;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc('\r', dout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc(c, dout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
1996-12-06 05:06:46 +03:00
|
|
|
#if 0 /* this violates RFC */
|
|
|
|
if (c == '\r') {
|
|
|
|
(void)putc('\0', dout);
|
|
|
|
bytes++;
|
|
|
|
}
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes < hashbytes)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(fin))
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (ferror(dout)) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netout");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
progressmeter(1);
|
1999-10-05 17:05:39 +04:00
|
|
|
if (closefunc != NULL) {
|
1993-03-21 12:45:37 +03:00
|
|
|
(*closefunc)(fin);
|
1999-10-05 17:05:39 +04:00
|
|
|
fin = NULL;
|
|
|
|
}
|
1999-10-05 17:44:39 +04:00
|
|
|
(void)fclose(dout);
|
|
|
|
dout = NULL;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes > 0)
|
1996-12-06 05:06:46 +03:00
|
|
|
ptransfer(0);
|
1997-11-01 17:36:49 +03:00
|
|
|
goto cleanupsend;
|
1999-10-05 17:05:39 +04:00
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
abort:
|
1999-10-06 02:04:30 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
|
|
|
oldintr = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (!cpend) {
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanupsend;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-06 02:04:30 +04:00
|
|
|
if (data >= 0) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
}
|
|
|
|
if (dout) {
|
|
|
|
(void)fclose(dout);
|
|
|
|
dout = NULL;
|
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
(void)getreply(0);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
if (bytes > 0)
|
|
|
|
ptransfer(0);
|
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
cleanupsend:
|
1999-10-05 17:05:39 +04:00
|
|
|
if (oldintr)
|
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1999-10-06 02:04:30 +04:00
|
|
|
if (oldintp)
|
|
|
|
(void)xsignal(SIGPIPE, oldintp);
|
1999-10-09 07:00:55 +04:00
|
|
|
if (data >= 0) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
if (closefunc != NULL && fin != NULL)
|
|
|
|
(*closefunc)(fin);
|
|
|
|
if (dout)
|
|
|
|
(void)fclose(dout);
|
1997-11-01 17:36:49 +03:00
|
|
|
progress = oprogress;
|
|
|
|
restart_point = 0;
|
1999-10-05 17:05:39 +04:00
|
|
|
bytes = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
recvrequest(const char *cmd, const char *local, const char *remote,
|
|
|
|
const char *lmode, int printnames, int ignorespecial)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1997-07-20 13:45:35 +04:00
|
|
|
FILE *fout, *din;
|
2000-05-01 14:35:16 +04:00
|
|
|
int (*closefunc)(FILE *);
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldintr, oldintp;
|
1997-07-20 13:45:35 +04:00
|
|
|
int c, d;
|
|
|
|
volatile int is_retr, tcrflag, bare_lfs;
|
1999-07-02 09:41:45 +04:00
|
|
|
static size_t bufsize;
|
|
|
|
static char *buf;
|
1997-07-20 13:45:35 +04:00
|
|
|
volatile off_t hashbytes;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct stat st;
|
1996-11-28 06:12:28 +03:00
|
|
|
time_t mtime;
|
1996-12-06 05:06:46 +03:00
|
|
|
struct timeval tval[2];
|
1997-03-13 09:23:11 +03:00
|
|
|
int oprogress;
|
1997-03-16 17:24:14 +03:00
|
|
|
int opreserve;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&local;
|
|
|
|
(void)&fout;
|
|
|
|
(void)&din;
|
|
|
|
(void)&closefunc;
|
|
|
|
(void)&oldintr;
|
|
|
|
(void)&oldintp;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
fout = NULL;
|
|
|
|
din = NULL;
|
1996-12-06 05:06:46 +03:00
|
|
|
hashbytes = mark;
|
1996-11-25 08:13:18 +03:00
|
|
|
direction = "received";
|
|
|
|
bytes = 0;
|
1997-07-20 13:45:35 +04:00
|
|
|
bare_lfs = 0;
|
1996-12-06 05:06:46 +03:00
|
|
|
filesize = -1;
|
1997-03-13 09:23:11 +03:00
|
|
|
oprogress = progress;
|
1997-03-16 17:24:14 +03:00
|
|
|
opreserve = preserve;
|
1997-11-01 17:36:49 +03:00
|
|
|
is_retr = (strcmp(cmd, "RETR") == 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (is_retr && verbose && printnames) {
|
1997-08-18 14:20:13 +04:00
|
|
|
if (local && (ignorespecial || *local != '-'))
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s ", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (remote)
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "remote: %s\n", remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy && is_retr) {
|
|
|
|
proxtrans(cmd, local, remote);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
closefunc = NULL;
|
|
|
|
oldintr = NULL;
|
|
|
|
oldintp = NULL;
|
|
|
|
tcrflag = !crflag && is_retr;
|
1999-10-09 07:00:55 +04:00
|
|
|
if (sigsetjmp(xferabort, 1)) {
|
1999-10-24 16:31:36 +04:00
|
|
|
while (cpend)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-06 02:04:30 +04:00
|
|
|
(void)xsignal(SIGQUIT, psummary);
|
1999-10-09 07:00:55 +04:00
|
|
|
oldintr = xsignal(SIGINT, abortxfer);
|
1997-08-18 14:20:13 +04:00
|
|
|
if (ignorespecial || (strcmp(local, "-") && *local != '|')) {
|
1997-09-13 13:05:52 +04:00
|
|
|
if (access(local, W_OK) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
char *dir = strrchr(local, '/');
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
if (errno != ENOENT && errno != EACCES) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (dir != NULL)
|
|
|
|
*dir = 0;
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
d = access(dir == local ? "/" :
|
|
|
|
dir ? local : ".", W_OK);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (dir != NULL)
|
|
|
|
*dir = '/';
|
|
|
|
if (d < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (!runique && errno == EACCES &&
|
1998-06-04 12:28:35 +04:00
|
|
|
chmod(local, (S_IRUSR|S_IWUSR)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (runique && errno == EACCES &&
|
|
|
|
(local = gunique(local)) == NULL) {
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (runique && (local = gunique(local)) == NULL) {
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!is_retr) {
|
|
|
|
if (curtype != TYPE_A)
|
|
|
|
changetype(TYPE_A, 0);
|
1996-12-06 05:06:46 +03:00
|
|
|
} else {
|
|
|
|
if (curtype != type)
|
|
|
|
changetype(type, 0);
|
1996-12-29 07:05:29 +03:00
|
|
|
filesize = remotesize(remote, 0);
|
1999-10-24 16:31:36 +04:00
|
|
|
if (code == 421 || code == -1)
|
|
|
|
goto cleanuprecv;
|
1996-12-06 05:06:46 +03:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
if (initconn()) {
|
1999-10-05 17:44:39 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-09 07:00:55 +04:00
|
|
|
if (sigsetjmp(xferabort, 1))
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
if (is_retr && restart_point &&
|
2000-08-02 02:47:25 +04:00
|
|
|
command("REST " LLF, (LLT) restart_point) != CONTINUE)
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1999-11-27 00:41:55 +03:00
|
|
|
if (! EMPTYSTRING(remote)) {
|
1999-10-24 16:31:36 +04:00
|
|
|
if (command("%s %s", cmd, remote) != PRELIM)
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
} else {
|
1999-10-24 16:31:36 +04:00
|
|
|
if (command("%s", cmd) != PRELIM)
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
din = dataconn("r");
|
|
|
|
if (din == NULL)
|
|
|
|
goto abort;
|
1997-08-18 14:20:13 +04:00
|
|
|
if (!ignorespecial && strcmp(local, "-") == 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
fout = stdout;
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = 0;
|
1997-08-18 14:20:13 +04:00
|
|
|
} else if (!ignorespecial && *local == '|') {
|
1999-09-28 03:09:42 +04:00
|
|
|
oldintp = xsignal(SIGPIPE, SIG_IGN);
|
1993-03-21 12:45:37 +03:00
|
|
|
fout = popen(local + 1, "w");
|
|
|
|
if (fout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("%s", local+1);
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
progress = 0;
|
1997-03-16 17:24:14 +03:00
|
|
|
preserve = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
closefunc = pclose;
|
|
|
|
} else {
|
|
|
|
fout = fopen(local, lmode);
|
|
|
|
if (fout == NULL) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
}
|
|
|
|
closefunc = fclose;
|
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
|
1999-09-22 11:18:31 +04:00
|
|
|
if (fstat(fileno(fout), &st) != -1 && !S_ISREG(st.st_mode)) {
|
|
|
|
progress = 0;
|
|
|
|
preserve = 0;
|
|
|
|
}
|
|
|
|
if (rcvbuf_size > bufsize) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (buf)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)free(buf);
|
1999-09-22 11:18:31 +04:00
|
|
|
bufsize = rcvbuf_size;
|
1998-08-03 05:49:25 +04:00
|
|
|
buf = xmalloc(bufsize);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-09-22 11:18:31 +04:00
|
|
|
|
1996-12-06 05:06:46 +03:00
|
|
|
progressmeter(-1);
|
1999-09-22 11:18:31 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
switch (curtype) {
|
|
|
|
|
|
|
|
case TYPE_I:
|
|
|
|
case TYPE_L:
|
1997-11-01 17:36:49 +03:00
|
|
|
if (is_retr && restart_point &&
|
1994-08-25 07:47:50 +04:00
|
|
|
lseek(fileno(fout), restart_point, SEEK_SET) < 0) {
|
|
|
|
warn("local: %s", local);
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-12-11 05:02:21 +03:00
|
|
|
if (rate_get) { /* rate limiting */
|
|
|
|
while (1) {
|
|
|
|
struct timeval then, now, td;
|
|
|
|
off_t bufrem;
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
|
1999-09-21 17:17:22 +04:00
|
|
|
(void)gettimeofday(&then, NULL);
|
1999-12-11 05:02:21 +03:00
|
|
|
errno = c = d = 0;
|
|
|
|
for (bufrem = rate_get; bufrem > 0; ) {
|
|
|
|
if ((c = read(fileno(din), buf,
|
|
|
|
MIN(bufsize, bufrem))) <= 0)
|
|
|
|
goto recvdone;
|
|
|
|
bytes += c;
|
|
|
|
bufrem -=c;
|
|
|
|
if ((d = write(fileno(fout), buf, c))
|
|
|
|
!= c)
|
|
|
|
goto recvdone;
|
|
|
|
if (hash &&
|
|
|
|
(!progress || filesize < 0)) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* sleep until time is up */
|
|
|
|
while (1) {
|
|
|
|
(void)gettimeofday(&now, NULL);
|
|
|
|
timersub(&now, &then, &td);
|
|
|
|
if (td.tv_sec > 0)
|
|
|
|
break;
|
|
|
|
usleep(1000000 - td.tv_usec);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else { /* faster code (no limiting) */
|
|
|
|
while (1) {
|
|
|
|
errno = c = d = 0;
|
|
|
|
if ((c = read(fileno(din), buf, bufsize)) <= 0)
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
goto recvdone;
|
|
|
|
bytes += c;
|
|
|
|
if ((d = write(fileno(fout), buf, c)) != c)
|
|
|
|
goto recvdone;
|
|
|
|
if (hash && (!progress || filesize < 0)) {
|
|
|
|
while (bytes >= hashbytes) {
|
|
|
|
(void)putc('#', ttyout);
|
|
|
|
hashbytes += mark;
|
|
|
|
}
|
|
|
|
(void)fflush(ttyout);
|
|
|
|
}
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
[fear this; more ftp hacking from lukem :-]
features:
---------
* transfer rate throttling with the new `rate' command. syntax:
rate direction [max [incr]]
where direction is `all', `get' or `put'.
if max is not supplied, the current settings are displayed.
if max is supplied, then transfers in the given direction will
be throttled to this value.
if incr is supplied, the increment for the `on-the-fly' scaling
will be set to that, otherwise `1024' is used.
currently implemented for binary get, binary put, and url fetches.
not yet supported for ascii get or put, or local file copies.
* on-the-fly scaling of the throttle based on signals:
- SIGUSR1 raises the throttle rate by the increment for that direction
- SIGUSR2 lowers the throttle rate by the increment for that direction
* -T dir,max[,incr] option to set rate from the command line
* `k', `m', `g' suffix support for bytecounts in the `hash', `rate',
`rcvbuf' and `sndbuf' commands)
bug fixes and code mods:
------------------------
* fix up ftp_login() so that ruserpass() is always called, even for
command-line url fetches.
* implement strsuftoi(), which parses a given number into a int with
suffix support. replaces getsockbufsize()
* implement parserate(), which does the argv parsing for -T and rate
* save and restore errno in signal handlers (may not be necessary, but
it doesn't hurt)
notes:
------
the rate command has had reasonable testing, but I'd like feedback
if it doesn't do the right thing, especially from people on slower
(i.e, modem) links.
I haven't tested the rate throttle against a http server which does
`transfer-encoding: chunked' because I couldn't find a server to
test against.
1999-06-29 14:43:16 +04:00
|
|
|
recvdone:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0) && bytes > 0) {
|
1996-11-25 08:13:18 +03:00
|
|
|
if (bytes < mark)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (c < 0) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netin");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
if (d < c) {
|
|
|
|
if (d < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
else
|
1994-08-25 07:47:50 +04:00
|
|
|
warnx("%s: short write", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_A:
|
1997-11-01 17:36:49 +03:00
|
|
|
if (is_retr && restart_point) {
|
|
|
|
int ch;
|
|
|
|
long i, n;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
if (fseek(fout, 0L, SEEK_SET) < 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
goto done;
|
1997-11-01 17:36:49 +03:00
|
|
|
n = (long)restart_point;
|
1993-03-21 12:45:37 +03:00
|
|
|
for (i = 0; i++ < n;) {
|
|
|
|
if ((ch = getc(fout)) == EOF)
|
|
|
|
goto done;
|
|
|
|
if (ch == '\n')
|
|
|
|
i++;
|
|
|
|
}
|
1994-08-25 07:47:50 +04:00
|
|
|
if (fseek(fout, 0L, SEEK_CUR) < 0) {
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
done:
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
while ((c = getc(din)) != EOF) {
|
|
|
|
if (c == '\n')
|
|
|
|
bare_lfs++;
|
|
|
|
while (c == '\r') {
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
while (hash && (!progress || filesize < 0) &&
|
1996-12-06 05:06:46 +03:00
|
|
|
(bytes >= hashbytes)) {
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)fflush(ttyout);
|
1996-11-25 08:13:18 +03:00
|
|
|
hashbytes += mark;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
bytes++;
|
|
|
|
if ((c = getc(din)) != '\n' || tcrflag) {
|
|
|
|
if (ferror(fout))
|
|
|
|
goto break2;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc('\r', fout);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (c == '\0') {
|
|
|
|
bytes++;
|
|
|
|
goto contin2;
|
|
|
|
}
|
|
|
|
if (c == EOF)
|
|
|
|
goto contin2;
|
|
|
|
}
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)putc(c, fout);
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes++;
|
|
|
|
contin2: ;
|
|
|
|
}
|
|
|
|
break2:
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
if (hash && (!progress || filesize < 0)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (bytes < hashbytes)
|
1998-06-04 12:28:35 +04:00
|
|
|
(void)putc('#', ttyout);
|
|
|
|
(void)putc('\n', ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ferror(din)) {
|
|
|
|
if (errno != EPIPE)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("netin");
|
1993-03-21 12:45:37 +03:00
|
|
|
bytes = -1;
|
|
|
|
}
|
|
|
|
if (ferror(fout))
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
progressmeter(1);
|
1999-10-05 17:05:39 +04:00
|
|
|
if (closefunc != NULL) {
|
1993-03-21 12:45:37 +03:00
|
|
|
(*closefunc)(fout);
|
1999-10-05 17:05:39 +04:00
|
|
|
fout = NULL;
|
|
|
|
}
|
1999-10-05 17:44:39 +04:00
|
|
|
(void)fclose(din);
|
|
|
|
din = NULL;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1999-05-04 18:12:37 +04:00
|
|
|
if (bare_lfs) {
|
|
|
|
fprintf(ttyout,
|
|
|
|
"WARNING! %d bare linefeeds received in ASCII mode.\n",
|
|
|
|
bare_lfs);
|
|
|
|
fputs("File may not have transferred correctly.\n", ttyout);
|
|
|
|
}
|
1996-12-29 07:05:29 +03:00
|
|
|
if (bytes >= 0 && is_retr) {
|
|
|
|
if (bytes > 0)
|
|
|
|
ptransfer(0);
|
1996-11-28 06:12:28 +03:00
|
|
|
if (preserve && (closefunc == fclose)) {
|
1996-12-29 07:05:29 +03:00
|
|
|
mtime = remotemodtime(remote, 0);
|
1996-11-28 06:12:28 +03:00
|
|
|
if (mtime != -1) {
|
1998-01-18 17:23:33 +03:00
|
|
|
(void)gettimeofday(&tval[0], NULL);
|
1996-12-06 05:06:46 +03:00
|
|
|
tval[1].tv_sec = mtime;
|
|
|
|
tval[1].tv_usec = 0;
|
|
|
|
if (utimes(local, tval) == -1) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout,
|
1997-03-13 09:23:11 +03:00
|
|
|
"Can't change modification time on %s to %s",
|
|
|
|
local, asctime(localtime(&mtime)));
|
1996-11-28 06:12:28 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1999-10-05 17:05:39 +04:00
|
|
|
goto cleanuprecv;
|
1997-03-13 09:23:11 +03:00
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
abort:
|
1999-10-05 17:05:39 +04:00
|
|
|
/*
|
|
|
|
* abort using RFC 959 recommended IP,SYNC sequence
|
|
|
|
*/
|
1999-10-09 16:48:12 +04:00
|
|
|
if (! sigsetjmp(xferabort, 1)) {
|
|
|
|
/* this is the first call */
|
|
|
|
(void)xsignal(SIGINT, abort_squared);
|
|
|
|
if (!cpend) {
|
|
|
|
code = -1;
|
|
|
|
goto cleanuprecv;
|
|
|
|
}
|
|
|
|
abort_remote(din);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-10-06 02:04:30 +04:00
|
|
|
code = -1;
|
1999-10-05 17:05:39 +04:00
|
|
|
if (bytes > 0)
|
|
|
|
ptransfer(0);
|
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
cleanuprecv:
|
1999-10-05 17:05:39 +04:00
|
|
|
if (oldintr)
|
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1999-10-06 02:04:30 +04:00
|
|
|
if (oldintp)
|
|
|
|
(void)xsignal(SIGPIPE, oldintp);
|
1999-10-09 07:00:55 +04:00
|
|
|
if (data >= 0) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
if (closefunc != NULL && fout != NULL)
|
|
|
|
(*closefunc)(fout);
|
|
|
|
if (din)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fclose(din);
|
1999-10-05 17:05:39 +04:00
|
|
|
progress = oprogress;
|
|
|
|
preserve = opreserve;
|
|
|
|
bytes = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Need to start a listen on the data channel before we send the command,
|
|
|
|
* otherwise the server's connect may fail.
|
|
|
|
*/
|
1994-08-25 07:47:50 +04:00
|
|
|
int
|
2000-05-01 14:35:16 +04:00
|
|
|
initconn(void)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1994-08-25 07:47:50 +04:00
|
|
|
char *p, *a;
|
1993-03-21 12:45:37 +03:00
|
|
|
int result, len, tmpno = 0;
|
|
|
|
int on = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
int error;
|
|
|
|
u_int addr[16], port[2];
|
|
|
|
u_int af, hal, pal;
|
|
|
|
char *pasvcmd = NULL;
|
1994-08-25 08:27:41 +04:00
|
|
|
|
1999-09-21 17:17:22 +04:00
|
|
|
#ifdef INET6
|
2000-03-14 19:36:05 +03:00
|
|
|
if (myctladdr.su_family == AF_INET6 && debug &&
|
2000-07-30 10:10:43 +04:00
|
|
|
(IN6_IS_ADDR_LINKLOCAL(&myctladdr.si_su.su_sin6.sin6_addr) ||
|
|
|
|
IN6_IS_ADDR_SITELOCAL(&myctladdr.si_su.su_sin6.sin6_addr))) {
|
1999-09-01 09:03:41 +04:00
|
|
|
warnx("use of scoped address can be troublesome");
|
|
|
|
}
|
1999-09-21 17:17:22 +04:00
|
|
|
#endif
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
reinit:
|
1994-08-25 08:27:41 +04:00
|
|
|
if (passivemode) {
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr = myctladdr;
|
|
|
|
data = socket(data_addr.su_family, SOCK_STREAM, 0);
|
1994-08-25 08:27:41 +04:00
|
|
|
if (data < 0) {
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("socket");
|
1997-01-19 17:19:02 +03:00
|
|
|
return (1);
|
1994-08-25 08:27:41 +04:00
|
|
|
}
|
|
|
|
if ((options & SO_DEBUG) &&
|
|
|
|
setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0)
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("setsockopt (ignored)");
|
1999-07-12 00:37:39 +04:00
|
|
|
result = COMPLETE + 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-10-01 12:01:12 +04:00
|
|
|
if (epsv4 && !epsv4bad) {
|
2000-10-11 18:46:00 +04:00
|
|
|
pasvcmd = "EPSV";
|
|
|
|
result = command("EPSV");
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
1999-07-14 01:43:31 +04:00
|
|
|
/*
|
|
|
|
* this code is to be friendly with broken
|
|
|
|
* BSDI ftpd
|
|
|
|
*/
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
|
|
|
"wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
}
|
1999-10-01 12:01:12 +04:00
|
|
|
if (result != COMPLETE) {
|
|
|
|
epsv4bad = 1;
|
|
|
|
if (debug)
|
|
|
|
fputs(
|
|
|
|
"disabling epsv4 for this connection\n",
|
|
|
|
ttyout);
|
|
|
|
}
|
1999-07-14 01:43:31 +04:00
|
|
|
}
|
1999-10-24 16:31:36 +04:00
|
|
|
if (result != COMPLETE) {
|
2000-10-11 18:46:00 +04:00
|
|
|
pasvcmd = "PASV";
|
|
|
|
result = command("PASV");
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
break;
|
1999-09-21 17:17:22 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
2000-10-11 18:46:00 +04:00
|
|
|
pasvcmd = "EPSV";
|
|
|
|
result = command("EPSV");
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
1999-07-14 01:43:31 +04:00
|
|
|
/* this code is to be friendly with broken BSDI ftpd */
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
|
|
|
"wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
}
|
2000-10-11 18:46:00 +04:00
|
|
|
if (result != COMPLETE) {
|
|
|
|
pasvcmd = "LPSV";
|
|
|
|
result = command("LPSV");
|
|
|
|
}
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
1999-07-02 12:07:40 +04:00
|
|
|
break;
|
1999-09-21 17:17:22 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
default:
|
1999-07-20 21:52:03 +04:00
|
|
|
result = COMPLETE + 1;
|
1999-07-12 00:37:39 +04:00
|
|
|
break;
|
1999-07-02 12:07:40 +04:00
|
|
|
}
|
|
|
|
if (result != COMPLETE) {
|
1998-06-04 12:28:35 +04:00
|
|
|
if (activefallback) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
passivemode = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
#if 0
|
1998-06-04 12:28:35 +04:00
|
|
|
activefallback = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
#endif
|
1998-06-04 12:28:35 +04:00
|
|
|
goto reinit;
|
|
|
|
}
|
|
|
|
fputs("Passive mode refused.\n", ttyout);
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
#define pack2(var, off) \
|
1999-07-02 12:07:40 +04:00
|
|
|
(((var[(off) + 0] & 0xff) << 8) | ((var[(off) + 1] & 0xff) << 0))
|
1999-10-24 16:31:36 +04:00
|
|
|
#define pack4(var, off) \
|
1999-07-02 12:07:40 +04:00
|
|
|
(((var[(off) + 0] & 0xff) << 24) | ((var[(off) + 1] & 0xff) << 16) | \
|
|
|
|
((var[(off) + 2] & 0xff) << 8) | ((var[(off) + 3] & 0xff) << 0))
|
2000-06-11 19:15:52 +04:00
|
|
|
#define UC(b) (((int)b)&0xff)
|
1999-07-02 12:07:40 +04:00
|
|
|
|
1994-08-25 08:27:41 +04:00
|
|
|
/*
|
1999-07-02 12:07:40 +04:00
|
|
|
* What we've got at this point is a string of comma separated
|
|
|
|
* one-byte unsigned integer values, separated by commas.
|
1994-08-25 08:27:41 +04:00
|
|
|
*/
|
1999-07-14 01:43:31 +04:00
|
|
|
if (strcmp(pasvcmd, "PASV") == 0) {
|
|
|
|
if (data_addr.su_family != AF_INET) {
|
|
|
|
fputs(
|
2000-07-30 13:32:09 +04:00
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
1999-07-14 01:43:31 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 227) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 227\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
error = sscanf(pasv, "%u,%u,%u,%u,%u,%u",
|
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&port[0], &port[1]);
|
|
|
|
if (error != 6) {
|
|
|
|
fputs(
|
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in);
|
2000-07-30 10:10:43 +04:00
|
|
|
data_addr.si_su.su_sin.sin_addr.s_addr =
|
|
|
|
htonl(pack4(addr, 0));
|
1999-07-14 01:43:31 +04:00
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
} else if (strcmp(pasvcmd, "LPSV") == 0) {
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 228) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 228\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-07-14 01:43:31 +04:00
|
|
|
error = sscanf(pasv,
|
|
|
|
"%u,%u,%u,%u,%u,%u,%u,%u,%u",
|
1999-07-20 21:52:03 +04:00
|
|
|
&af, &hal,
|
1999-07-14 01:43:31 +04:00
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&pal, &port[0], &port[1]);
|
1999-07-20 21:52:03 +04:00
|
|
|
if (error != 9) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
1999-07-14 01:43:31 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
if (af != 4 || hal != 4 || pal != 2) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in);
|
2000-07-30 10:10:43 +04:00
|
|
|
data_addr.si_su.su_sin.sin_addr.s_addr =
|
|
|
|
htonl(pack4(addr, 0));
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
break;
|
1999-09-21 17:17:22 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
|
|
|
error = sscanf(pasv,
|
|
|
|
"%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u",
|
|
|
|
&af, &hal,
|
|
|
|
&addr[0], &addr[1], &addr[2], &addr[3],
|
|
|
|
&addr[4], &addr[5], &addr[6], &addr[7],
|
|
|
|
&addr[8], &addr[9], &addr[10],
|
|
|
|
&addr[11], &addr[12], &addr[13],
|
|
|
|
&addr[14], &addr[15],
|
|
|
|
&pal, &port[0], &port[1]);
|
1999-07-20 21:52:03 +04:00
|
|
|
if (error != 21) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode address scan failure. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-20 21:52:03 +04:00
|
|
|
if (af != 6 || hal != 16 || pal != 2) {
|
1999-07-02 12:07:40 +04:00
|
|
|
fputs(
|
1999-07-20 21:52:03 +04:00
|
|
|
"Passive mode AF mismatch. Shouldn't happen!\n", ttyout);
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1994-08-25 08:27:41 +04:00
|
|
|
|
1999-07-02 12:07:40 +04:00
|
|
|
error = 0;
|
|
|
|
memset(&data_addr, 0, sizeof(data_addr));
|
|
|
|
data_addr.su_family = AF_INET6;
|
|
|
|
data_addr.su_len = sizeof(struct sockaddr_in6);
|
1999-09-03 08:29:57 +04:00
|
|
|
{
|
2000-06-11 19:15:52 +04:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < sizeof(struct in6_addr); i++) {
|
2000-07-30 10:10:43 +04:00
|
|
|
data_addr.si_su.su_sin6.sin6_addr.s6_addr[i] =
|
2000-06-11 19:15:52 +04:00
|
|
|
UC(addr[i]);
|
|
|
|
}
|
1999-09-03 08:29:57 +04:00
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_port = htons(pack2(port, 0));
|
|
|
|
break;
|
1999-09-21 17:17:22 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
default:
|
|
|
|
error = 1;
|
|
|
|
}
|
|
|
|
} else if (strcmp(pasvcmd, "EPSV") == 0) {
|
|
|
|
char delim[4];
|
|
|
|
|
|
|
|
port[0] = 0;
|
1999-07-18 02:39:18 +04:00
|
|
|
if (code / 10 == 22 && code != 229) {
|
1999-07-14 01:43:31 +04:00
|
|
|
fputs("wrong server: return code must be 229\n",
|
|
|
|
ttyout);
|
|
|
|
error = 1;
|
|
|
|
goto bad;
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
if (sscanf(pasv, "%c%c%c%d%c", &delim[0],
|
|
|
|
&delim[1], &delim[2], &port[1],
|
|
|
|
&delim[3]) != 5) {
|
1999-07-20 21:52:03 +04:00
|
|
|
fputs("parse error!\n", ttyout);
|
|
|
|
error = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (delim[0] != delim[1] || delim[0] != delim[2]
|
|
|
|
|| delim[0] != delim[3]) {
|
1999-07-20 21:52:03 +04:00
|
|
|
fputs("parse error!\n", ttyout);
|
|
|
|
error = 1;
|
1999-07-02 12:07:40 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
data_addr = hisctladdr;
|
|
|
|
data_addr.su_port = htons(port[1]);
|
|
|
|
} else
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
|
2000-07-30 10:10:43 +04:00
|
|
|
while (xconnect(data, (struct sockaddr *)&data_addr.si_su,
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_len) < 0) {
|
1998-06-04 12:28:35 +04:00
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
1999-01-06 02:33:44 +03:00
|
|
|
if (activefallback) {
|
|
|
|
(void)close(data);
|
|
|
|
data = -1;
|
|
|
|
passivemode = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
#if 0
|
1999-01-06 02:33:44 +03:00
|
|
|
activefallback = 0;
|
1999-10-24 16:31:36 +04:00
|
|
|
#endif
|
1999-01-06 02:33:44 +03:00
|
|
|
goto reinit;
|
|
|
|
}
|
1996-12-29 07:05:29 +03:00
|
|
|
warn("connect");
|
1994-08-25 08:27:41 +04:00
|
|
|
goto bad;
|
|
|
|
}
|
2000-02-28 13:12:27 +03:00
|
|
|
#ifdef IPTOS_THROUGHPUT
|
1999-07-02 12:07:40 +04:00
|
|
|
if (data_addr.su_family == AF_INET) {
|
|
|
|
on = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
2000-02-28 13:12:27 +03:00
|
|
|
#endif
|
1997-01-19 17:19:02 +03:00
|
|
|
return (0);
|
1994-08-25 08:27:41 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
noport:
|
1993-03-21 12:45:37 +03:00
|
|
|
data_addr = myctladdr;
|
|
|
|
if (sendport)
|
1999-07-02 12:07:40 +04:00
|
|
|
data_addr.su_port = 0; /* let system pick one */
|
1993-03-21 12:45:37 +03:00
|
|
|
if (data != -1)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1999-07-02 12:07:40 +04:00
|
|
|
data = socket(data_addr.su_family, SOCK_STREAM, 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (data < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("socket");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
if (!sendport)
|
1996-11-28 06:12:28 +03:00
|
|
|
if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt (reuse address)");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
2000-07-30 10:10:43 +04:00
|
|
|
if (bind(data, (struct sockaddr *)&data_addr.si_su,
|
|
|
|
data_addr.su_len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("bind");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (options & SO_DEBUG &&
|
1996-11-28 06:12:28 +03:00
|
|
|
setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
|
1997-03-13 09:23:11 +03:00
|
|
|
sizeof(on)) < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("setsockopt (ignored)");
|
2000-07-30 13:32:09 +04:00
|
|
|
len = sizeof(data_addr.si_su);
|
|
|
|
memset((char *)&data_addr, 0, sizeof (data_addr));
|
2000-07-30 10:10:43 +04:00
|
|
|
if (getsockname(data, (struct sockaddr *)&data_addr.si_su, &len) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("getsockname");
|
1993-03-21 12:45:37 +03:00
|
|
|
goto bad;
|
|
|
|
}
|
2000-07-30 13:32:09 +04:00
|
|
|
data_addr.su_len = len;
|
1998-07-10 08:39:03 +04:00
|
|
|
if (xlisten(data, 1) < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("listen");
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
if (sendport) {
|
2000-11-24 16:01:24 +03:00
|
|
|
char hname[NI_MAXHOST], sname[NI_MAXSERV];
|
1999-07-02 12:07:40 +04:00
|
|
|
int af;
|
2000-11-24 16:01:24 +03:00
|
|
|
struct sockinet tmp;
|
1999-07-02 12:07:40 +04:00
|
|
|
|
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
1999-10-01 12:01:12 +04:00
|
|
|
if (!epsv4 || epsv4bad) {
|
1999-07-12 00:37:39 +04:00
|
|
|
result = COMPLETE + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
2000-11-15 07:09:19 +03:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
af = (data_addr.su_family == AF_INET) ? 1 : 2;
|
2000-11-24 16:01:24 +03:00
|
|
|
tmp = data_addr;
|
|
|
|
if (tmp.su_family == AF_INET6)
|
|
|
|
tmp.si_su.su_sin6.sin6_scope_id = 0;
|
|
|
|
if (getnameinfo((struct sockaddr *)&tmp.si_su,
|
|
|
|
tmp.su_len, hname, sizeof(hname), sname,
|
|
|
|
sizeof(sname), NI_NUMERICHOST | NI_NUMERICSERV)) {
|
1999-07-02 12:07:40 +04:00
|
|
|
result = ERROR;
|
|
|
|
} else {
|
2000-11-24 16:01:24 +03:00
|
|
|
result = command("EPRT |%d|%s|%s|", af, hname,
|
|
|
|
sname);
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
1999-10-01 12:01:12 +04:00
|
|
|
if (result != COMPLETE) {
|
|
|
|
epsv4bad = 1;
|
|
|
|
if (debug)
|
|
|
|
fputs(
|
|
|
|
"disabling epsv4 for this connection\n",
|
|
|
|
ttyout);
|
|
|
|
}
|
1999-07-02 12:07:40 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
result = COMPLETE + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (result == COMPLETE)
|
|
|
|
goto skip_port;
|
|
|
|
|
|
|
|
switch (data_addr.su_family) {
|
|
|
|
case AF_INET:
|
2000-07-30 10:10:43 +04:00
|
|
|
a = (char *)&data_addr.si_su.su_sin.sin_addr;
|
1999-07-02 12:07:40 +04:00
|
|
|
p = (char *)&data_addr.su_port;
|
|
|
|
result = command("PORT %d,%d,%d,%d,%d,%d",
|
|
|
|
UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),
|
|
|
|
UC(p[0]), UC(p[1]));
|
|
|
|
break;
|
1999-08-30 02:21:57 +04:00
|
|
|
#ifdef INET6
|
1999-07-02 12:07:40 +04:00
|
|
|
case AF_INET6:
|
2000-07-30 10:10:43 +04:00
|
|
|
a = (char *)&data_addr.si_su.su_sin6.sin6_addr;
|
1999-07-02 12:07:40 +04:00
|
|
|
p = (char *)&data_addr.su_port;
|
|
|
|
result = command(
|
1999-10-24 16:31:36 +04:00
|
|
|
"LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
|
1999-07-02 12:07:40 +04:00
|
|
|
6, 16,
|
|
|
|
UC(a[0]),UC(a[1]),UC(a[2]),UC(a[3]),
|
|
|
|
UC(a[4]),UC(a[5]),UC(a[6]),UC(a[7]),
|
|
|
|
UC(a[8]),UC(a[9]),UC(a[10]),UC(a[11]),
|
|
|
|
UC(a[12]),UC(a[13]),UC(a[14]),UC(a[15]),
|
|
|
|
2, UC(p[0]), UC(p[1]));
|
|
|
|
break;
|
1999-08-30 02:21:57 +04:00
|
|
|
#endif
|
1999-07-02 12:07:40 +04:00
|
|
|
default:
|
|
|
|
result = COMPLETE + 1; /* xxx */
|
|
|
|
}
|
1999-10-24 16:31:36 +04:00
|
|
|
if (!connected)
|
|
|
|
return (1);
|
1999-07-02 12:07:40 +04:00
|
|
|
skip_port:
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
if (result == ERROR && sendport == -1) {
|
|
|
|
sendport = 0;
|
|
|
|
tmpno = 1;
|
|
|
|
goto noport;
|
|
|
|
}
|
|
|
|
return (result != COMPLETE);
|
|
|
|
}
|
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
2000-02-28 13:12:27 +03:00
|
|
|
#ifdef IPTOS_THROUGHPUT
|
1999-07-02 12:07:40 +04:00
|
|
|
if (data_addr.su_family == AF_INET) {
|
|
|
|
on = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on,
|
|
|
|
sizeof(int)) < 0)
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
2000-02-28 13:12:27 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
return (0);
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
bad:
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data), data = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (tmpno)
|
|
|
|
sendport = 1;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
FILE *
|
2000-05-01 14:35:16 +04:00
|
|
|
dataconn(const char *lmode)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2000-07-30 10:10:43 +04:00
|
|
|
struct sockinet from;
|
1999-07-02 12:07:40 +04:00
|
|
|
int s, fromlen = myctladdr.su_len;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-08-25 08:27:41 +04:00
|
|
|
if (passivemode)
|
|
|
|
return (fdopen(data, lmode));
|
|
|
|
|
2000-07-30 13:32:09 +04:00
|
|
|
s = accept(data, (struct sockaddr *) &from.si_su, &fromlen);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (s < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("accept");
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data), data = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
return (NULL);
|
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)close(data);
|
1993-03-21 12:45:37 +03:00
|
|
|
data = s;
|
2000-02-28 13:12:27 +03:00
|
|
|
#ifdef IPTOS_THROUGHPUT
|
1999-07-02 12:07:40 +04:00
|
|
|
if (from.su_family == AF_INET) {
|
|
|
|
int tos = IPTOS_THROUGHPUT;
|
|
|
|
if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos,
|
|
|
|
sizeof(int)) < 0) {
|
|
|
|
warn("setsockopt TOS (ignored)");
|
|
|
|
}
|
|
|
|
}
|
2000-02-28 13:12:27 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
return (fdopen(data, lmode));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
psabort(int notused)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-10-09 07:00:55 +04:00
|
|
|
int oerrno = errno;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
abrtflag++;
|
1999-10-09 07:00:55 +04:00
|
|
|
errno = oerrno;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
pswitch(int flag)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldintr;
|
1993-03-21 12:45:37 +03:00
|
|
|
static struct comvars {
|
|
|
|
int connect;
|
|
|
|
char name[MAXHOSTNAMELEN];
|
2000-07-30 10:10:43 +04:00
|
|
|
struct sockinet mctl;
|
|
|
|
struct sockinet hctl;
|
1993-03-21 12:45:37 +03:00
|
|
|
FILE *in;
|
|
|
|
FILE *out;
|
|
|
|
int tpe;
|
|
|
|
int curtpe;
|
|
|
|
int cpnd;
|
|
|
|
int sunqe;
|
|
|
|
int runqe;
|
|
|
|
int mcse;
|
|
|
|
int ntflg;
|
|
|
|
char nti[17];
|
|
|
|
char nto[17];
|
|
|
|
int mapflg;
|
|
|
|
char mi[MAXPATHLEN];
|
|
|
|
char mo[MAXPATHLEN];
|
|
|
|
} proxstruct, tmpstruct;
|
|
|
|
struct comvars *ip, *op;
|
|
|
|
|
|
|
|
abrtflag = 0;
|
1999-09-28 03:09:42 +04:00
|
|
|
oldintr = xsignal(SIGINT, psabort);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (flag) {
|
|
|
|
if (proxy)
|
|
|
|
return;
|
|
|
|
ip = &tmpstruct;
|
|
|
|
op = &proxstruct;
|
|
|
|
proxy++;
|
|
|
|
} else {
|
|
|
|
if (!proxy)
|
|
|
|
return;
|
|
|
|
ip = &proxstruct;
|
|
|
|
op = &tmpstruct;
|
|
|
|
proxy = 0;
|
|
|
|
}
|
|
|
|
ip->connect = connected;
|
|
|
|
connected = op->connect;
|
1999-09-28 10:47:38 +04:00
|
|
|
if (hostname)
|
|
|
|
(void)strlcpy(ip->name, hostname, sizeof(ip->name));
|
|
|
|
else
|
1997-03-13 09:23:11 +03:00
|
|
|
ip->name[0] = '\0';
|
1993-03-21 12:45:37 +03:00
|
|
|
hostname = op->name;
|
|
|
|
ip->hctl = hisctladdr;
|
|
|
|
hisctladdr = op->hctl;
|
|
|
|
ip->mctl = myctladdr;
|
|
|
|
myctladdr = op->mctl;
|
|
|
|
ip->in = cin;
|
|
|
|
cin = op->in;
|
|
|
|
ip->out = cout;
|
|
|
|
cout = op->out;
|
|
|
|
ip->tpe = type;
|
|
|
|
type = op->tpe;
|
|
|
|
ip->curtpe = curtype;
|
|
|
|
curtype = op->curtpe;
|
|
|
|
ip->cpnd = cpend;
|
|
|
|
cpend = op->cpnd;
|
|
|
|
ip->sunqe = sunique;
|
|
|
|
sunique = op->sunqe;
|
|
|
|
ip->runqe = runique;
|
|
|
|
runique = op->runqe;
|
|
|
|
ip->mcse = mcase;
|
|
|
|
mcase = op->mcse;
|
|
|
|
ip->ntflg = ntflag;
|
|
|
|
ntflag = op->ntflg;
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(ip->nti, ntin, sizeof(ip->nti));
|
|
|
|
(void)strlcpy(ntin, op->nti, sizeof(ntin));
|
|
|
|
(void)strlcpy(ip->nto, ntout, sizeof(ip->nto));
|
|
|
|
(void)strlcpy(ntout, op->nto, sizeof(ntout));
|
1993-03-21 12:45:37 +03:00
|
|
|
ip->mapflg = mapflag;
|
|
|
|
mapflag = op->mapflg;
|
1999-09-28 10:47:38 +04:00
|
|
|
(void)strlcpy(ip->mi, mapin, sizeof(ip->mi));
|
|
|
|
(void)strlcpy(mapin, op->mi, sizeof(mapin));
|
|
|
|
(void)strlcpy(ip->mo, mapout, sizeof(ip->mo));
|
|
|
|
(void)strlcpy(mapout, op->mo, sizeof(mapout));
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (abrtflag) {
|
|
|
|
abrtflag = 0;
|
|
|
|
(*oldintr)(SIGINT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
abortpt(int notused)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1994-08-25 07:47:50 +04:00
|
|
|
|
[Yet Another Huge Ftp Commit - hopefully the last for a while,
barring any more little things people want added ...]
New features:
* progressmeter is now asynchronous, so "stalled" transfers can be
detected. "- stalled -" is displayed instead of the ETA in this case.
When the xfer resumes, the time that the xfer was stalled for is
factored out of the ETA. It is debatable whether this is better than
not factoring it out, but I like it this way (I.e, if it stalls for 8
seconds and the ETA was 30 seconds, when it resumes the ETA will still
be 30 seconds).
* verbosity can be disabled on the command line (-V), so that in auto-fetch
mode the only lines displayed will be a description of the file, and
the progress bar (if possible)
* if the screen is resized (and detected via the SIGWINCH signal), the
progress bar will rescale automatically.
Bugs fixed:
* progress bar will not use the last character on the line, as this can
cause problems on some terminals
* screen dimensions (via ioctl(TIOCWINSZ)) should use stdout not stdin
* progressmeter() used some vars before initialising them
* ^D will quit now. [fixes bin/3162]
* use hstrerror() to generate error message for host name lookup failure.
* use getcwd instead of getwd (it should have been OK, but why tempt fate?)
* auto-fetch transfers will always return a positive exit value upon failure
or interruption, relative to the file's position in argv[].
* remote completion of / will work, without putting a leading "///".
This is actually a bug in ftpd(1), where "NLST /" prefixes all names
with "//", but fixing every ftpd(1) is not an option...
1997-02-01 13:44:54 +03:00
|
|
|
alarmtimer(0);
|
1999-10-12 10:04:59 +04:00
|
|
|
if (fromatty)
|
|
|
|
write(fileno(ttyout), "\n", 1);
|
1993-03-21 12:45:37 +03:00
|
|
|
ptabflg++;
|
|
|
|
mflag = 0;
|
|
|
|
abrtflag = 0;
|
1999-10-09 07:00:55 +04:00
|
|
|
siglongjmp(ptabort, 1);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
proxtrans(const char *cmd, const char *local, const char *remote)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2000-02-01 01:01:03 +03:00
|
|
|
sigfunc oldintr;
|
1997-07-20 13:45:35 +04:00
|
|
|
int prox_type, nfnd;
|
|
|
|
volatile int secndflag;
|
1993-03-21 12:45:37 +03:00
|
|
|
char *cmd2;
|
|
|
|
|
1998-06-04 12:28:35 +04:00
|
|
|
#ifdef __GNUC__ /* to shut up gcc warnings */
|
1997-07-20 13:45:35 +04:00
|
|
|
(void)&oldintr;
|
|
|
|
(void)&cmd2;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
oldintr = NULL;
|
|
|
|
secndflag = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (strcmp(cmd, "RETR"))
|
|
|
|
cmd2 = "RETR";
|
|
|
|
else
|
|
|
|
cmd2 = runique ? "STOU" : "STOR";
|
|
|
|
if ((prox_type = type) == 0) {
|
|
|
|
if (unix_server && unix_proxy)
|
|
|
|
prox_type = TYPE_I;
|
|
|
|
else
|
|
|
|
prox_type = TYPE_A;
|
|
|
|
}
|
|
|
|
if (curtype != prox_type)
|
|
|
|
changetype(prox_type, 1);
|
|
|
|
if (command("PASV") != COMPLETE) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("proxy server does not support third party transfers.\n",
|
|
|
|
ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
pswitch(0);
|
|
|
|
if (!connected) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("No primary connection.\n", ttyout);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (curtype != prox_type)
|
|
|
|
changetype(prox_type, 1);
|
|
|
|
if (command("PORT %s", pasv) != COMPLETE) {
|
|
|
|
pswitch(1);
|
|
|
|
return;
|
|
|
|
}
|
1999-10-09 07:00:55 +04:00
|
|
|
if (sigsetjmp(ptabort, 1))
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
1999-09-28 03:09:42 +04:00
|
|
|
oldintr = xsignal(SIGINT, abortpt);
|
1999-02-19 19:29:27 +03:00
|
|
|
if ((restart_point &&
|
2000-08-02 02:47:25 +04:00
|
|
|
(command("REST " LLF, (LLT) restart_point) != CONTINUE))
|
2000-07-30 08:42:37 +04:00
|
|
|
|| (command("%s %s", cmd, remote) != PRELIM)) {
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sleep(2);
|
|
|
|
pswitch(1);
|
|
|
|
secndflag++;
|
1999-02-19 19:29:27 +03:00
|
|
|
if ((restart_point &&
|
2000-08-02 02:47:25 +04:00
|
|
|
(command("REST " LLF, (LLT) restart_point) != CONTINUE))
|
2000-07-30 08:42:37 +04:00
|
|
|
|| (command("%s %s", cmd2, local) != PRELIM))
|
1993-03-21 12:45:37 +03:00
|
|
|
goto abort;
|
|
|
|
ptflag++;
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(0);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
ptflag = 0;
|
1998-06-04 12:28:35 +04:00
|
|
|
fprintf(ttyout, "local: %s remote: %s\n", local, remote);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
add support for FEAT and OPTS commands with `features' and `opts'.
(from RFC 2389).
add support for MLST & MLSD (machine parseble listings) with 'mlst', 'mlsd'
and 'pmlsd' (mlsd |$PAGER) commands. (from draft-ietf-ftpext-mlst-11)
rename remotesyst() to getremoteinfo(), and modify to parse the result from
FEAT (if supported), and take into account the support for the various
extensions such as MDTM, SIZE, REST (STREAM), MLSD, and FEAT/OPTS.
put each feature into one of the following categories:
- known to work (explicit FEAT)
- unknown but assume works until explicit failure, when it's
then tagged as `known not to work'.
- known not to work (FEAT succeeded but didn't return anything,
or was unknown and then explicit failure)
assign results into features[] matrix.
add support to getreply() so that an optional callback will be called
for each line received from the server except for the first and last.
this is used in FEAT (and MLST) parsing.
modify various commands to check if REST (STREAM), MDTM and SIZE are
explicitly or implicitly supported before using.
fix `syst' when verbose is off.
minor knf (indent goto labels by one space, etc).
simply various command usage handlers by assuming that argv != NULL except
for quit() and disconnect().
2000-07-18 11:16:52 +04:00
|
|
|
abort:
|
1999-10-09 16:48:12 +04:00
|
|
|
if (sigsetjmp(xferabort, 1)) {
|
|
|
|
(void)xsignal(SIGINT, oldintr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
(void)xsignal(SIGINT, abort_squared);
|
1993-03-21 12:45:37 +03:00
|
|
|
ptflag = 0;
|
|
|
|
if (strcmp(cmd, "RETR") && !proxy)
|
|
|
|
pswitch(1);
|
|
|
|
else if (!strcmp(cmd, "RETR") && proxy)
|
|
|
|
pswitch(0);
|
|
|
|
if (!cpend && !secndflag) { /* only here if cmd = "STOR" (proxy=1) */
|
|
|
|
if (command("%s %s", cmd2, local) != PRELIM) {
|
|
|
|
pswitch(0);
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(!proxy);
|
|
|
|
if (!cpend && !secndflag) { /* only if cmd = "RETR" (proxy=1) */
|
|
|
|
if (command("%s %s", cmd2, local) != PRELIM) {
|
|
|
|
pswitch(0);
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (cpend)
|
1998-01-18 17:23:33 +03:00
|
|
|
abort_remote(NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
pswitch(!proxy);
|
|
|
|
if (cpend) {
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, NULL, 10)) <= 0) {
|
1999-10-24 16:31:36 +04:00
|
|
|
if (nfnd < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (proxy)
|
|
|
|
pswitch(0);
|
|
|
|
pswitch(1);
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-09-28 03:09:42 +04:00
|
|
|
(void)xsignal(SIGINT, oldintr);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
reset(int argc, char *argv[])
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
int nfnd = 1;
|
|
|
|
|
1999-10-24 16:31:36 +04:00
|
|
|
if (argc == 0 && argv != NULL) {
|
|
|
|
fprintf(ttyout, "usage: %s\n", argv[0]);
|
|
|
|
code = -1;
|
|
|
|
return;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
while (nfnd > 0) {
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, NULL, 0)) < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("reset");
|
1993-03-21 12:45:37 +03:00
|
|
|
code = -1;
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
|
|
|
} else if (nfnd)
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2000-05-01 14:35:16 +04:00
|
|
|
gunique(const char *local)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
|
|
|
static char new[MAXPATHLEN];
|
1994-08-25 07:47:50 +04:00
|
|
|
char *cp = strrchr(local, '/');
|
1999-09-28 10:47:38 +04:00
|
|
|
int d, count=0, len;
|
1993-03-21 12:45:37 +03:00
|
|
|
char ext = '1';
|
|
|
|
|
|
|
|
if (cp)
|
|
|
|
*cp = '\0';
|
1997-09-13 13:05:52 +04:00
|
|
|
d = access(cp == local ? "/" : cp ? local : ".", W_OK);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (cp)
|
|
|
|
*cp = '/';
|
|
|
|
if (d < 0) {
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("local: %s", local);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-09-28 10:47:38 +04:00
|
|
|
len = strlcpy(new, local, sizeof(new));
|
|
|
|
cp = &new[len];
|
|
|
|
*cp++ = '.';
|
1993-03-21 12:45:37 +03:00
|
|
|
while (!d) {
|
|
|
|
if (++count == 100) {
|
1998-06-04 12:28:35 +04:00
|
|
|
fputs("runique: can't find unique file name.\n",
|
|
|
|
ttyout);
|
1998-01-18 17:23:33 +03:00
|
|
|
return (NULL);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
*cp++ = ext;
|
|
|
|
*cp = '\0';
|
|
|
|
if (ext == '9')
|
|
|
|
ext = '0';
|
|
|
|
else
|
|
|
|
ext++;
|
1997-09-13 13:05:52 +04:00
|
|
|
if ((d = access(new, F_OK)) < 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
if (ext != '0')
|
|
|
|
cp--;
|
|
|
|
else if (*(cp - 2) == '.')
|
|
|
|
*(cp - 1) = '1';
|
|
|
|
else {
|
|
|
|
*(cp - 2) = *(cp - 2) + 1;
|
|
|
|
cp--;
|
|
|
|
}
|
|
|
|
}
|
1994-08-25 07:47:50 +04:00
|
|
|
return (new);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1999-10-09 16:48:12 +04:00
|
|
|
/*
|
|
|
|
* abort_squared --
|
|
|
|
* aborts abort_remote(). lostpeer() is called because if the user is
|
|
|
|
* too impatient to wait or there's another problem then ftp really
|
|
|
|
* needs to get back to a known state.
|
|
|
|
*/
|
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
abort_squared(int dummy)
|
1999-10-09 16:48:12 +04:00
|
|
|
{
|
|
|
|
char msgbuf[100];
|
|
|
|
int len;
|
|
|
|
|
|
|
|
alarmtimer(0);
|
|
|
|
len = strlcpy(msgbuf, "\nremote abort aborted; closing connection.\n",
|
|
|
|
sizeof(msgbuf));
|
|
|
|
write(fileno(ttyout), msgbuf, len);
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
1999-10-09 16:48:12 +04:00
|
|
|
siglongjmp(xferabort, 1);
|
|
|
|
}
|
|
|
|
|
1994-08-25 07:47:50 +04:00
|
|
|
void
|
2000-05-01 14:35:16 +04:00
|
|
|
abort_remote(FILE *din)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
1999-09-24 10:57:37 +04:00
|
|
|
char buf[BUFSIZ];
|
1993-03-21 12:45:37 +03:00
|
|
|
int nfnd;
|
|
|
|
|
1997-03-13 09:23:11 +03:00
|
|
|
if (cout == NULL) {
|
|
|
|
warnx("Lost control connection for abort.");
|
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
1997-03-13 09:23:11 +03:00
|
|
|
return;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* send IAC in urgent mode instead of DM because 4.3BSD places oob mark
|
|
|
|
* after urgent byte rather than before as is protocol now
|
|
|
|
*/
|
1999-09-22 07:01:53 +04:00
|
|
|
buf[0] = IAC;
|
|
|
|
buf[1] = IP;
|
|
|
|
buf[2] = IAC;
|
1993-03-21 12:45:37 +03:00
|
|
|
if (send(fileno(cout), buf, 3, MSG_OOB) != 3)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1996-11-28 06:12:28 +03:00
|
|
|
fprintf(cout, "%cABOR\r\n", DM);
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)fflush(cout);
|
1999-06-24 18:50:56 +04:00
|
|
|
if ((nfnd = empty(cin, din, 10)) <= 0) {
|
1999-10-24 16:31:36 +04:00
|
|
|
if (nfnd < 0)
|
1994-08-25 07:47:50 +04:00
|
|
|
warn("abort");
|
1993-03-21 12:45:37 +03:00
|
|
|
if (ptabflg)
|
|
|
|
code = -1;
|
1999-10-24 16:31:36 +04:00
|
|
|
lostpeer(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-06-24 18:50:56 +04:00
|
|
|
if (din && (nfnd & 2)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
while (read(fileno(din), buf, BUFSIZ) > 0)
|
1999-06-24 18:50:56 +04:00
|
|
|
continue;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (getreply(0) == ERROR && code == 552) {
|
|
|
|
/* 552 needed for nic style abort */
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1997-03-13 09:23:11 +03:00
|
|
|
(void)getreply(0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2000-05-29 18:57:27 +04:00
|
|
|
|
|
|
|
void
|
|
|
|
ai_unmapped(struct addrinfo *ai)
|
|
|
|
{
|
2000-06-05 13:22:52 +04:00
|
|
|
#ifdef INET6
|
2000-05-29 18:57:27 +04:00
|
|
|
struct sockaddr_in6 *sin6;
|
|
|
|
struct sockaddr_in sin;
|
2000-06-11 06:12:05 +04:00
|
|
|
int len;
|
2000-05-29 18:57:27 +04:00
|
|
|
|
|
|
|
if (ai->ai_family != AF_INET6)
|
|
|
|
return;
|
|
|
|
if (ai->ai_addrlen != sizeof(struct sockaddr_in6) ||
|
|
|
|
sizeof(sin) > ai->ai_addrlen)
|
|
|
|
return;
|
|
|
|
sin6 = (struct sockaddr_in6 *)ai->ai_addr;
|
|
|
|
if (!IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
|
|
|
|
return;
|
|
|
|
|
|
|
|
memset(&sin, 0, sizeof(sin));
|
|
|
|
sin.sin_family = AF_INET;
|
2000-06-11 06:12:05 +04:00
|
|
|
len = sizeof(struct sockaddr_in);
|
2000-05-29 18:57:27 +04:00
|
|
|
memcpy(&sin.sin_addr, &sin6->sin6_addr.s6_addr[12],
|
|
|
|
sizeof(sin.sin_addr));
|
|
|
|
sin.sin_port = sin6->sin6_port;
|
|
|
|
|
|
|
|
ai->ai_family = AF_INET;
|
2000-08-02 02:47:25 +04:00
|
|
|
#if HAVE_SOCKADDR_SA_LEN
|
2000-06-11 06:12:05 +04:00
|
|
|
sin.sin_len = len;
|
|
|
|
#endif
|
|
|
|
memcpy(ai->ai_addr, &sin, len);
|
|
|
|
ai->ai_addrlen = len;
|
2000-06-05 13:22:52 +04:00
|
|
|
#endif
|
2000-05-29 18:57:27 +04:00
|
|
|
}
|