X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Ftftp.c;h=a2683971a87e6c88f9f6ef5f179b0841347efb2f;hb=1641d614fa13b87b38688bb845159493c821e476;hp=a62c5d8cc6137ba688d24a6f8d0edd283dc2d37b;hpb=9f739445cd3deddd0343c3a8d5a981ede26bef30;p=oweals%2Fbusybox.git diff --git a/networking/tftp.c b/networking/tftp.c index a62c5d8cc..a2683971a 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -19,18 +19,14 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * ------------------------------------------------------------------------- */ -#include "busybox.h" +#include "libbb.h" +#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT -#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ -#define TFTP_TIMEOUT 5 /* seconds */ -#define TFTP_NUM_RETRIES 5 /* number of retries */ - -static const char * const MODE_OCTET = "octet"; -#define MODE_OCTET_LEN 6 /* sizeof(MODE_OCTET)*/ - -static const char * const OPTION_BLOCKSIZE = "blksize"; -#define OPTION_BLOCKSIZE_LEN 8 /* sizeof(OPTION_BLOCKSIZE) */ +#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ +#define TFTP_TIMEOUT_MS 50 +#define TFTP_MAXTIMEOUT_MS 2000 +#define TFTP_NUM_RETRIES 12 /* number of backed-off retries */ /* opcodes we support */ #define TFTP_RRQ 1 @@ -40,24 +36,23 @@ static const char * const OPTION_BLOCKSIZE = "blksize"; #define TFTP_ERROR 5 #define TFTP_OACK 6 -static const char *const tftp_bb_error_msg[] = { - "Undefined error", - "File not found", - "Access violation", - "Disk full or allocation error", - "Illegal TFTP operation", - "Unknown transfer ID", - "File already exists", - "No such user" -}; - -#define tftp_cmd_get ENABLE_FEATURE_TFTP_GET - -#if ENABLE_FEATURE_TFTP_PUT -# define tftp_cmd_put (tftp_cmd_get+ENABLE_FEATURE_TFTP_PUT) +#if ENABLE_FEATURE_TFTP_GET && !ENABLE_FEATURE_TFTP_PUT +#define USE_GETPUT(...) +#define CMD_GET(cmd) 1 +#define CMD_PUT(cmd) 0 +#elif !ENABLE_FEATURE_TFTP_GET && ENABLE_FEATURE_TFTP_PUT +#define USE_GETPUT(...) +#define CMD_GET(cmd) 0 +#define CMD_PUT(cmd) 1 #else -# define tftp_cmd_put 0 +#define USE_GETPUT(...) __VA_ARGS__ +/* masks coming from getpot32 */ +#define CMD_GET(cmd) ((cmd) & 1) +#define CMD_PUT(cmd) ((cmd) & 2) #endif +/* NB: in the code below + * CMD_GET(cmd) and CMD_PUT(cmd) are mutually exclusive + */ #if ENABLE_FEATURE_TFTP_BLOCKSIZE @@ -70,8 +65,9 @@ static int tftp_blocksize_check(int blocksize, int bufsize) * to use blocksizes smaller than 22 octets. */ - if ((bufsize && (blocksize > bufsize)) || - (blocksize < 8) || (blocksize > 65564)) { + if ((bufsize && (blocksize > bufsize)) + || (blocksize < 8) || (blocksize > 65564) + ) { bb_error_msg("bad blocksize"); return 0; } @@ -79,41 +75,32 @@ static int tftp_blocksize_check(int blocksize, int bufsize) return blocksize; } -static char *tftp_option_get(char *buf, int len, const char * const option) +static char *tftp_option_get(char *buf, int len, const char *option) { int opt_val = 0; int opt_found = 0; int k; while (len > 0) { - /* Make sure the options are terminated correctly */ - for (k = 0; k < len; k++) { if (buf[k] == '\0') { - break; + goto nul_found; } } - - if (k >= len) { - break; - } - + return NULL; + nul_found: if (opt_val == 0) { if (strcasecmp(buf, option) == 0) { opt_found = 1; } - } else { - if (opt_found) { - return buf; - } + } else if (opt_found) { + return buf; } k++; - buf += k; len -= k; - opt_val ^= 1; } @@ -122,397 +109,318 @@ static char *tftp_option_get(char *buf, int len, const char * const option) #endif -static int tftp(const int cmd, const struct hostent *host, - const char *remotefile, const int localfd, - const unsigned short port, int tftp_bufsize) +static int tftp( USE_GETPUT(const int cmd,) + len_and_sockaddr *peer_lsa, + const char *remotefile, const int localfd, + unsigned port, int tftp_bufsize) { - struct sockaddr_in sa; - struct sockaddr_in from; - struct timeval tv; - socklen_t fromlen; - fd_set rfds; - int socketfd; + struct pollfd pfd[1]; +#define socketfd (pfd[0].fd) int len; - int opcode = 0; - int finished = 0; - int timeout = TFTP_NUM_RETRIES; - unsigned short block_nr = 1; - unsigned short tmp; + int send_len; + USE_FEATURE_TFTP_BLOCKSIZE(smallint want_option_ack = 0;) + smallint finished = 0; + uint16_t opcode; + uint16_t block_nr = 1; + uint16_t recv_blk; + int retries, waittime_ms; char *cp; - USE_FEATURE_TFTP_BLOCKSIZE(int want_option_ack = 0;) + unsigned org_port; + len_and_sockaddr *const from = alloca(offsetof(len_and_sockaddr, sa) + peer_lsa->len); /* Can't use RESERVE_CONFIG_BUFFER here since the allocation * size varies meaning BUFFERS_GO_ON_STACK would fail */ - char *buf=xmalloc(tftp_bufsize += 4); - - if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { - /* need to unlink the localfile, so don't use xsocket here. */ - bb_perror_msg("socket"); - return EXIT_FAILURE; - } + /* We must keep the transmit and receive buffers seperate */ + /* In case we rcv a garbage pkt and we need to rexmit the last pkt */ + char *xbuf = xmalloc(tftp_bufsize += 4); + char *rbuf = xmalloc(tftp_bufsize); - len = sizeof(sa); + port = org_port = htons(port); - memset(&sa, 0, len); - xbind(socketfd, (struct sockaddr *)&sa, len); - - sa.sin_family = host->h_addrtype; - sa.sin_port = port; - memcpy(&sa.sin_addr, (struct in_addr *) host->h_addr, - sizeof(sa.sin_addr)); + socketfd = xsocket(peer_lsa->sa.sa_family, SOCK_DGRAM, 0); /* build opcode */ - if (cmd & tftp_cmd_get) { + opcode = TFTP_WRQ; + if (CMD_GET(cmd)) { opcode = TFTP_RRQ; } - if (cmd & tftp_cmd_put) { - opcode = TFTP_WRQ; + cp = xbuf + 2; + /* add filename and mode */ + /* fill in packet if the filename fits into xbuf */ + len = strlen(remotefile) + 1; + if (2 + len + sizeof("octet") >= tftp_bufsize) { + bb_error_msg("remote filename is too long"); + goto ret; } - - while (1) { - - cp = buf; - - /* first create the opcode part */ - *((unsigned short *) cp) = htons(opcode); - cp += 2; - - /* add filename and mode */ - if (((cmd & tftp_cmd_get) && (opcode == TFTP_RRQ)) || - ((cmd & tftp_cmd_put) && (opcode == TFTP_WRQ))) - { - int too_long = 0; - - /* see if the filename fits into buf - * and fill in packet. */ - len = strlen(remotefile) + 1; - - if ((cp + len) >= &buf[tftp_bufsize - 1]) { - too_long = 1; - } else { - safe_strncpy(cp, remotefile, len); - cp += len; - } - - if (too_long || ((&buf[tftp_bufsize - 1] - cp) < MODE_OCTET_LEN)) { - bb_error_msg("remote filename too long"); - break; - } - - /* add "mode" part of the package */ - memcpy(cp, MODE_OCTET, MODE_OCTET_LEN); - cp += MODE_OCTET_LEN; + strcpy(cp, remotefile); + cp += len; + /* add "mode" part of the package */ + strcpy(cp, "octet"); + cp += sizeof("octet"); #if ENABLE_FEATURE_TFTP_BLOCKSIZE - - len = tftp_bufsize - 4; /* data block size */ - - if (len != TFTP_BLOCKSIZE_DEFAULT) { - - if ((&buf[tftp_bufsize - 1] - cp) < 15) { - bb_error_msg("remote filename too long"); - break; - } - - /* add "blksize" + number of blocks */ - memcpy(cp, OPTION_BLOCKSIZE, OPTION_BLOCKSIZE_LEN); - cp += OPTION_BLOCKSIZE_LEN; - cp += snprintf(cp, 6, "%d", len) + 1; - - want_option_ack = 1; - } -#endif + len = tftp_bufsize - 4; /* data block size */ + if (len != TFTP_BLOCKSIZE_DEFAULT) { + /* rfc2348 says that 65464 is a max allowed value */ + if ((&xbuf[tftp_bufsize - 1] - cp) < sizeof("blksize NNNNN")) { + bb_error_msg("remote filename is too long"); + goto ret; } + /* add "blksize", , blocksize */ + strcpy(cp, "blksize"); + cp += sizeof("blksize"); + cp += snprintf(cp, 6, "%d", len) + 1; + want_option_ack = 1; + } +#endif + /* First packet is built, so skip packet generation */ + goto send_pkt; - /* add ack and data */ - - if (((cmd & tftp_cmd_get) && (opcode == TFTP_ACK)) || - ((cmd & tftp_cmd_put) && (opcode == TFTP_DATA))) { - - *((unsigned short *) cp) = htons(block_nr); - - cp += 2; - - block_nr++; - - if ((cmd & tftp_cmd_put) && (opcode == TFTP_DATA)) { - len = full_read(localfd, cp, tftp_bufsize - 4); - - if (len < 0) { - bb_perror_msg(bb_msg_read_error); - break; - } - - if (len != (tftp_bufsize - 4)) { - finished++; - } + /* Using mostly goto's - continue/break will be less clear + * in where we actually jump to */ - cp += len; + while (1) { + /* Build ACK or DATA */ + cp = xbuf + 2; + *((uint16_t*)cp) = htons(block_nr); + cp += 2; + block_nr++; + opcode = TFTP_ACK; + if (CMD_PUT(cmd)) { + opcode = TFTP_DATA; + len = full_read(localfd, cp, tftp_bufsize - 4); + if (len < 0) { + bb_perror_msg(bb_msg_read_error); + goto ret; + } + if (len != (tftp_bufsize - 4)) { + finished = 1; } + cp += len; } + send_pkt: + /* Send packet */ + *((uint16_t*)xbuf) = htons(opcode); /* fill in opcode part */ + send_len = cp - xbuf; + /* NB: send_len value is preserved in code below + * for potential resend */ + retries = TFTP_NUM_RETRIES; /* re-initialize */ + waittime_ms = TFTP_TIMEOUT_MS; - /* send packet */ - - - timeout = TFTP_NUM_RETRIES; /* re-initialize */ - do { - - len = cp - buf; - + send_again: #if ENABLE_DEBUG_TFTP - fprintf(stderr, "sending %u bytes\n", len); - for (cp = buf; cp < &buf[len]; cp++) - fprintf(stderr, "%02x ", (unsigned char) *cp); - fprintf(stderr, "\n"); + fprintf(stderr, "sending %u bytes\n", send_len); + for (cp = xbuf; cp < &xbuf[send_len]; cp++) + fprintf(stderr, "%02x ", (unsigned char) *cp); + fprintf(stderr, "\n"); #endif - if (sendto(socketfd, buf, len, 0, - (struct sockaddr *) &sa, sizeof(sa)) < 0) { - bb_perror_msg("send"); - len = -1; - break; + xsendto(socketfd, xbuf, send_len, &peer_lsa->sa, peer_lsa->len); + /* Was it final ACK? then exit */ + if (finished && (opcode == TFTP_ACK)) + goto ret; + + recv_again: + /* Receive packet */ + /*pfd[0].fd = socketfd;*/ + pfd[0].events = POLLIN; + switch (safe_poll(pfd, 1, waittime_ms)) { + unsigned from_port; + case 1: + from->len = peer_lsa->len; + memset(&from->sa, 0, peer_lsa->len); + len = recvfrom(socketfd, rbuf, tftp_bufsize, 0, + &from->sa, &from->len); + if (len < 0) { + bb_perror_msg("recvfrom"); + goto ret; } - - - if (finished && (opcode == TFTP_ACK)) { - break; + from_port = get_nport(&from->sa); + if (port == org_port) { + /* Our first query went to port 69 + * but reply will come from different one. + * Remember and use this new port */ + port = from_port; + set_nport(peer_lsa, from_port); } - - /* receive packet */ - - memset(&from, 0, sizeof(from)); - fromlen = sizeof(from); - - tv.tv_sec = TFTP_TIMEOUT; - tv.tv_usec = 0; - - FD_ZERO(&rfds); - FD_SET(socketfd, &rfds); - - switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) { - case 1: - len = recvfrom(socketfd, buf, tftp_bufsize, 0, - (struct sockaddr *) &from, &fromlen); - - if (len < 0) { - bb_perror_msg("recvfrom"); - break; - } - - timeout = 0; - - if (sa.sin_port == port) { - sa.sin_port = from.sin_port; - } - if (sa.sin_port == from.sin_port) { - break; - } - - /* fall-through for bad packets! */ - /* discard the packet - treat as timeout */ - timeout = TFTP_NUM_RETRIES; - case 0: + if (port != from_port) + goto recv_again; + goto process_pkt; + case 0: + retries--; + if (retries == 0) { bb_error_msg("timeout"); - - timeout--; - if (timeout == 0) { - len = -1; - bb_error_msg("last timeout"); - } - break; - default: - bb_perror_msg("select"); - len = -1; + goto ret; } - } while (timeout && (len >= 0)); + /* exponential backoff with limit */ + waittime_ms += waittime_ms/2; + if (waittime_ms > TFTP_MAXTIMEOUT_MS) { + waittime_ms = TFTP_MAXTIMEOUT_MS; + } - if ((finished) || (len < 0)) { - break; + goto send_again; /* resend last sent pkt */ + default: + /*bb_perror_msg("poll"); - done in safe_poll */ + goto ret; } - - /* process received packet */ - - opcode = ntohs(*((unsigned short *) buf)); - tmp = ntohs(*((unsigned short *) &buf[2])); + process_pkt: + /* Process recv'ed packet */ + opcode = ntohs( ((uint16_t*)rbuf)[0] ); + recv_blk = ntohs( ((uint16_t*)rbuf)[1] ); #if ENABLE_DEBUG_TFTP - fprintf(stderr, "received %d bytes: %04x %04x\n", len, opcode, tmp); + fprintf(stderr, "received %d bytes: %04x %04x\n", len, opcode, recv_blk); #endif if (opcode == TFTP_ERROR) { - const char *msg = NULL; - - if (buf[4] != '\0') { - msg = &buf[4]; - buf[tftp_bufsize - 1] = '\0'; - } else if (tmp < (sizeof(tftp_bb_error_msg) - / sizeof(char *))) { - - msg = tftp_bb_error_msg[tmp]; - } - - if (msg) { - bb_error_msg("server says: %s", msg); + static const char *const errcode_str[] = { + "", + "file not found", + "access violation", + "disk full", + "illegal TFTP operation", + "unknown transfer id", + "file already exists", + "no such user", + "bad option" + }; + + const char *msg = ""; + + if (rbuf[4] != '\0') { + msg = &rbuf[4]; + rbuf[tftp_bufsize - 1] = '\0'; + } else if (recv_blk < ARRAY_SIZE(errcode_str)) { + msg = errcode_str[recv_blk]; } - - break; + bb_error_msg("server error: (%u) %s", recv_blk, msg); + goto ret; } + #if ENABLE_FEATURE_TFTP_BLOCKSIZE if (want_option_ack) { - want_option_ack = 0; if (opcode == TFTP_OACK) { - /* server seems to support options */ - char *res; - res = tftp_option_get(&buf[2], len - 2, OPTION_BLOCKSIZE); - + res = tftp_option_get(&rbuf[2], len - 2, "blksize"); if (res) { int blksize = xatoi_u(res); - - if (tftp_blocksize_check(blksize, tftp_bufsize - 4)) { - - if (cmd & tftp_cmd_put) { - opcode = TFTP_DATA; - } else { - opcode = TFTP_ACK; - } + if (!tftp_blocksize_check(blksize, tftp_bufsize - 4)) { + /* send ERROR 8 to server... */ + /* htons can be impossible to use in const initializer: */ + /*static const uint16_t error_8[2] = { htons(TFTP_ERROR), htons(8) };*/ + /* thus we open-code big-endian layout */ + static const uint8_t error_8[4] = { 0,TFTP_ERROR, 0,8 }; + xsendto(socketfd, error_8, 4, &peer_lsa->sa, peer_lsa->len); + bb_error_msg("server proposes bad blksize %d, exiting", blksize); + goto ret; + } #if ENABLE_DEBUG_TFTP - fprintf(stderr, "using %s %u\n", OPTION_BLOCKSIZE, - blksize); + fprintf(stderr, "using blksize %u\n", + blksize); #endif - tftp_bufsize = blksize + 4; - block_nr = 0; - continue; - } + tftp_bufsize = blksize + 4; + /* Send ACK for OACK ("block" no: 0) */ + block_nr = 0; + continue; } - /* FIXME: - * we should send ERROR 8 */ - bb_error_msg("bad server option"); - break; + /* rfc2347: + * "An option not acknowledged by the server + * must be ignored by the client and server + * as if it were never requested." */ } - bb_error_msg("warning: blksize not supported by server" - " - reverting to 512"); - + bb_error_msg("blksize is not supported by server" + " - reverting to 512"); tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4; } #endif + /* block_nr is already advanced to next block# we expect + * to get / block# we are about to send next time */ - if ((cmd & tftp_cmd_get) && (opcode == TFTP_DATA)) { - - if (tmp == block_nr) { - - len = full_write(localfd, &buf[4], len - 4); - + if (CMD_GET(cmd) && (opcode == TFTP_DATA)) { + if (recv_blk == block_nr) { + len = full_write(localfd, &rbuf[4], len - 4); if (len < 0) { bb_perror_msg(bb_msg_write_error); - break; + goto ret; } - if (len != (tftp_bufsize - 4)) { - finished++; + finished = 1; } - - opcode = TFTP_ACK; - continue; + continue; /* send ACK */ } - /* in case the last ack disappeared into the ether */ - if (tmp == (block_nr - 1)) { - --block_nr; - opcode = TFTP_ACK; - continue; - } else if (tmp + 1 == block_nr) { + if (recv_blk == (block_nr - 1)) { /* Server lost our TFTP_ACK. Resend it */ - block_nr = tmp; - opcode = TFTP_ACK; + block_nr = recv_blk; continue; } } - if ((cmd & tftp_cmd_put) && (opcode == TFTP_ACK)) { - - if (tmp == (unsigned short) (block_nr - 1)) { - if (finished) { - break; - } - - opcode = TFTP_DATA; - continue; + if (CMD_PUT(cmd) && (opcode == TFTP_ACK)) { + /* did server ACK our last DATA pkt? */ + if (recv_blk == (uint16_t) (block_nr - 1)) { + if (finished) + goto ret; + continue; /* send next block */ } } + /* Awww... recv'd packet is not recognized! */ + goto recv_again; + /* why recv_again? - rfc1123 says: + * "The sender (i.e., the side originating the DATA packets) + * must never resend the current DATA packet on receipt + * of a duplicate ACK". + * DATA pkts are resent ONLY on timeout. + * Thus "goto send_again" will ba a bad mistake above. + * See: + * http://en.wikipedia.org/wiki/Sorcerer's_Apprentice_Syndrome + */ } - -#if ENABLE_FEATURE_CLEAN_UP - close(socketfd); - free(buf); -#endif - - return finished ? EXIT_SUCCESS : EXIT_FAILURE; + ret: + if (ENABLE_FEATURE_CLEAN_UP) { + close(socketfd); + free(xbuf); + free(rbuf); + } + return finished == 0; /* returns 1 on failure */ } +int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tftp_main(int argc, char **argv) { - struct hostent *host = NULL; + len_and_sockaddr *peer_lsa; const char *localfile = NULL; const char *remotefile = NULL; +#if ENABLE_FEATURE_TFTP_BLOCKSIZE + const char *sblocksize = NULL; +#endif int port; - int cmd = 0; + USE_GETPUT(int cmd;) int fd = -1; int flags = 0; int result; int blocksize = TFTP_BLOCKSIZE_DEFAULT; - /* figure out what to pass to getopt */ - -#if ENABLE_FEATURE_TFTP_BLOCKSIZE - char *sblocksize = NULL; - -#define BS "b:" -#define BS_ARG , &sblocksize -#else -#define BS -#define BS_ARG -#endif - -#if ENABLE_FEATURE_TFTP_GET -#define GET "g" -#define GET_COMPL ":g" -#else -#define GET -#define GET_COMPL -#endif + /* -p or -g is mandatory, and they are mutually exclusive */ + opt_complementary = "" USE_FEATURE_TFTP_GET("g:") USE_FEATURE_TFTP_PUT("p:") + USE_GETPUT("?g--p:p--g"); -#if ENABLE_FEATURE_TFTP_PUT -#define PUT "p" -#define PUT_COMPL ":p" -#else -#define PUT -#define PUT_COMPL -#endif + USE_GETPUT(cmd =) getopt32(argv, + USE_FEATURE_TFTP_GET("g") USE_FEATURE_TFTP_PUT("p") + "l:r:" USE_FEATURE_TFTP_BLOCKSIZE("b:"), + &localfile, &remotefile + USE_FEATURE_TFTP_BLOCKSIZE(, &sblocksize)); + argv += optind; -#if defined(CONFIG_FEATURE_TFTP_GET) && defined(CONFIG_FEATURE_TFTP_PUT) - opt_complementary = GET_COMPL PUT_COMPL ":?g--p:p--g"; -#elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT) - opt_complementary = GET_COMPL PUT_COMPL; -#endif - - cmd = getopt32(argc, argv, GET PUT "l:r:" BS, &localfile, &remotefile BS_ARG); - - cmd &= (tftp_cmd_get | tftp_cmd_put); -#if ENABLE_FEATURE_TFTP_GET - if (cmd == tftp_cmd_get) + flags = O_RDONLY; + if (CMD_GET(cmd)) flags = O_WRONLY | O_CREAT | O_TRUNC; -#endif -#if ENABLE_FEATURE_TFTP_PUT - if (cmd == tftp_cmd_put) - flags = O_RDONLY; -#endif #if ENABLE_FEATURE_TFTP_BLOCKSIZE if (sblocksize) { @@ -523,39 +431,36 @@ int tftp_main(int argc, char **argv) } #endif - if (localfile == NULL) + if (!localfile) localfile = remotefile; - if (remotefile == NULL) + if (!remotefile) remotefile = localfile; - if ((localfile == NULL && remotefile == NULL) || (argv[optind] == NULL)) + /* Error if filename or host is not known */ + if (!remotefile || !argv[0]) bb_show_usage(); - if (localfile == NULL || LONE_DASH(localfile)) { - fd = (cmd == tftp_cmd_get) ? STDOUT_FILENO : STDIN_FILENO; - } else { - fd = open(localfile, flags, 0644); /* fail below */ - } - if (fd < 0) { - bb_perror_msg_and_die("local file"); + fd = CMD_GET(cmd) ? STDOUT_FILENO : STDIN_FILENO; + if (!LONE_DASH(localfile)) { + fd = xopen(localfile, flags); } - host = xgethostbyname(argv[optind]); - port = bb_lookup_port(argv[optind + 1], "udp", 69); + port = bb_lookup_port(argv[1], "udp", 69); + peer_lsa = xhost2sockaddr(argv[0], port); #if ENABLE_DEBUG_TFTP - fprintf(stderr, "using server \"%s\", remotefile \"%s\", " - "localfile \"%s\".\n", - inet_ntoa(*((struct in_addr *) host->h_addr)), + fprintf(stderr, "using server '%s', remotefile '%s', localfile '%s'\n", + xmalloc_sockaddr2dotted(&peer_lsa->sa), remotefile, localfile); #endif - result = tftp(cmd, host, remotefile, fd, port, blocksize); + result = tftp( USE_GETPUT(cmd,) peer_lsa, remotefile, fd, port, blocksize); - if (!(fd == STDOUT_FILENO || fd == STDIN_FILENO)) { - if (ENABLE_FEATURE_CLEAN_UP) - close(fd); - if (cmd == tftp_cmd_get && result != EXIT_SUCCESS) - unlink(localfile); + if (ENABLE_FEATURE_CLEAN_UP) + close(fd); + if (result != EXIT_SUCCESS && !LONE_DASH(localfile) && CMD_GET(cmd)) { + unlink(localfile); } return result; } + +#endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */