Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

Apply Magnus Damm's patch, adds tftp blocksize support, and some cleanups.

Browse Source
This commit is contained in:
Glenn L McGrath 2001-10-05 04:40:37 +00:00
parent 24e2833cdf
commit ad117d8a21
6 changed files with 515 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Config.h
View File

@ -378,6 +378,7 @@
// Tell tftp what commands that should be supported. // Tell tftp what commands that should be supported.
#define BB_FEATURE_TFTP_PUT #define BB_FEATURE_TFTP_PUT
#define BB_FEATURE_TFTP_GET #define BB_FEATURE_TFTP_GET
//#define BB_FEATURE_TFTP_BLOCKSIZE
// //
// features for vi // features for vi
#define BB_FEATURE_VI_COLON // ":" colon commands, no "ex" mode #define BB_FEATURE_VI_COLON // ":" colon commands, no "ex" mode

12
applets/usage.h
View File

@ -1615,13 +1615,19 @@
#else #else
#define USAGE_TFTP_PUT(a) #define USAGE_TFTP_PUT(a)
#endif #endif
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
#define USAGE_TFTP_BS(a) a
#else
#define USAGE_TFTP_BS(a)
#endif
#define tftp_trivial_usage \ #define tftp_trivial_usage \
"[OPTION]... HOST [PORT]" "[OPTION]... HOST [PORT]"
#define tftp_full_usage \ #define tftp_full_usage \
"Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \ "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
"Options:\n" \ "Options:\n" \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \ "\t-l FILE\tLocal FILE.\n" \
"\t-r FILE\tRemote FILE.\n" \
USAGE_TFTP_GET( \ USAGE_TFTP_GET( \
"\t-g\tGet file.\n" \ "\t-g\tGet file.\n" \
) \ ) \
@ -1629,7 +1635,9 @@
USAGE_TFTP_PUT( \ USAGE_TFTP_PUT( \
"\t-p\tPut file.\n" \ "\t-p\tPut file.\n" \
) \ ) \
"\t-r FILE\tTransfer remote FILE.\n" USAGE_TFTP_BS( \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
)
#define touch_trivial_usage \ #define touch_trivial_usage \
"[-c] FILE [FILE ...]" "[-c] FILE [FILE ...]"

12
include/usage.h
View File

@ -1615,13 +1615,19 @@
#else #else
#define USAGE_TFTP_PUT(a) #define USAGE_TFTP_PUT(a)
#endif #endif
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
#define USAGE_TFTP_BS(a) a
#else
#define USAGE_TFTP_BS(a)
#endif
#define tftp_trivial_usage \ #define tftp_trivial_usage \
"[OPTION]... HOST [PORT]" "[OPTION]... HOST [PORT]"
#define tftp_full_usage \ #define tftp_full_usage \
"Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \ "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
"Options:\n" \ "Options:\n" \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \ "\t-l FILE\tLocal FILE.\n" \
"\t-r FILE\tRemote FILE.\n" \
USAGE_TFTP_GET( \ USAGE_TFTP_GET( \
"\t-g\tGet file.\n" \ "\t-g\tGet file.\n" \
) \ ) \
@ -1629,7 +1635,9 @@
USAGE_TFTP_PUT( \ USAGE_TFTP_PUT( \
"\t-p\tPut file.\n" \ "\t-p\tPut file.\n" \
) \ ) \
"\t-r FILE\tTransfer remote FILE.\n" USAGE_TFTP_BS( \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
)
#define touch_trivial_usage \ #define touch_trivial_usage \
"[-c] FILE [FILE ...]" "[-c] FILE [FILE ...]"

293
networking/tftp.c
View File

@ -3,7 +3,8 @@
/* */ /* */
/* A simple tftp client for busybox. */ /* A simple tftp client for busybox. */
/* Tries to follow RFC1350. */ /* Tries to follow RFC1350. */
/* Only "octet" mode and 512-byte data blocks are supported. */ /* Only "octet" mode supported. */
/* Optional blocksize negotiation (RFC2347 + RFC2348) */
/* */ /* */
/* Copyright (C) 2001 Magnus Damm <damm@opensource.se> */ /* Copyright (C) 2001 Magnus Damm <damm@opensource.se> */
/* */ /* */
@ -47,6 +48,18 @@
//#define BB_FEATURE_TFTP_DEBUG //#define BB_FEATURE_TFTP_DEBUG
#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */
#define TFTP_TIMEOUT 5 /* seconds */
/* opcodes we support */
#define TFTP_RRQ 1
#define TFTP_WRQ 2
#define TFTP_DATA 3
#define TFTP_ACK 4
#define TFTP_ERROR 5
#define TFTP_OACK 6
static const char *tftp_error_msg[] = { static const char *tftp_error_msg[] = {
"Undefined error", "Undefined error",
"File not found", "File not found",
@ -61,8 +74,71 @@ static const char *tftp_error_msg[] = {
const int tftp_cmd_get = 1; const int tftp_cmd_get = 1;
const int tftp_cmd_put = 2; const int tftp_cmd_put = 2;
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
static int tftp_blocksize_check(int blocksize, int bufsize)
{
/* Check if the blocksize is valid:
* RFC2348 says between 8 and 65464,
* but our implementation makes it impossible
* to use blocksizes smaller than 22 octets.
*/
if ((bufsize && (blocksize > bufsize)) ||
(blocksize < 8) || (blocksize > 65464)) {
error_msg("bad blocksize");
return 0;
}
return blocksize;
}
static char *tftp_option_get(char *buf, int len, 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;
}
}
if (k >= len) {
break;
}
if (opt_val == 0) {
if (strcasecmp(buf, option) == 0) {
opt_found = 1;
}
}
else {
if (opt_found) {
return buf;
}
}
k++;
buf += k;
len -= k;
opt_val ^= 1;
}
return NULL;
}
#endif
static inline int tftp(const int cmd, const struct hostent *host, static inline int tftp(const int cmd, const struct hostent *host,
const char *serverfile, int localfd, const int port, int tftp_bufsize) const char *remotefile, int localfd, const int port, int tftp_bufsize)
{ {
const int cmd_get = cmd & tftp_cmd_get; const int cmd_get = cmd & tftp_cmd_get;
const int cmd_put = cmd & tftp_cmd_put; const int cmd_put = cmd & tftp_cmd_put;
@ -81,7 +157,12 @@ static inline int tftp(const int cmd, const struct hostent *host,
int finished = 0; int finished = 0;
int timeout = bb_tftp_num_retries; int timeout = bb_tftp_num_retries;
int block_nr = 1; int block_nr = 1;
RESERVE_BB_BUFFER(buf, tftp_bufsize + 4); // Why 4 ?
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
int want_option_ack = 0;
#endif
RESERVE_BB_BUFFER(buf, tftp_bufsize + 4); /* Opcode + Block # + Data */
tftp_bufsize += 4; tftp_bufsize += 4;
@ -103,50 +184,79 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* build opcode */ /* build opcode */
if (cmd_get) { if (cmd_get) {
opcode = 1; // read request = 1 opcode = TFTP_RRQ;
} }
if (cmd_put) { if (cmd_put) {
opcode = 2; // write request = 2 opcode = TFTP_WRQ;
} }
while (1) { while (1) {
/* build packet of type "opcode" */
cp = buf; cp = buf;
/* first create the opcode part */
*((unsigned short *) cp) = htons(opcode); *((unsigned short *) cp) = htons(opcode);
cp += 2; cp += 2;
/* add filename and mode */ /* add filename and mode */
if ((cmd_get && (opcode == 1)) || // read request = 1 if ((cmd_get && (opcode == TFTP_RRQ)) ||
(cmd_put && (opcode == 2))) { // write request = 2 (cmd_put && (opcode == TFTP_WRQ))) {
int too_long = 0;
/* what is this trying to do ? */ /* see if the filename fits into buf */
while (cp != &buf[tftp_bufsize - 1]) { /* and fill in packet */
if ((*cp = *serverfile++) == '\0')
break; len = strlen(remotefile) + 1;
cp++;
if ((cp + len) >= &buf[tftp_bufsize - 1]) {
too_long = 1;
} }
/* and this ? */ else {
if ((*cp != '\0') || (&buf[tftp_bufsize - 1] - cp) < 7) { safe_strncpy(cp, remotefile, len);
error_msg("too long server-filename"); cp += len;
}
if (too_long || ((&buf[tftp_bufsize - 1] - cp) < 6)) {
error_msg("too long remote-filename");
break; break;
} }
memcpy(cp + 1, "octet", 6); /* add "mode" part of the package */
cp += 7;
memcpy(cp, "octet", 6);
cp += 6;
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
len = tftp_bufsize - 4; /* data block size */
if (len != TFTP_BLOCKSIZE_DEFAULT) {
if ((&buf[tftp_bufsize - 1] - cp) < 15) {
error_msg("too long remote-filename");
break;
}
/* add "blksize" + number of blocks */
memcpy(cp, "blksize", 8);
cp += 8;
cp += snprintf(cp, 6, "%d", len) + 1;
want_option_ack = 1;
}
#endif
} }
/* add ack and data */ /* add ack and data */
if ((cmd_get && (opcode == 4)) || // acknowledgement = 4 if ((cmd_get && (opcode == TFTP_ACK)) ||
(cmd_put && (opcode == 3))) { // data packet == 3 (cmd_put && (opcode == TFTP_DATA))) {
*((unsigned short *) cp) = htons(block_nr); *((unsigned short *) cp) = htons(block_nr);
@ -154,7 +264,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
block_nr++; block_nr++;
if (cmd_put && (opcode == 3)) { // data packet == 3 if (cmd_put && (opcode == TFTP_DATA)) {
len = read(localfd, cp, tftp_bufsize - 4); len = read(localfd, cp, tftp_bufsize - 4);
if (len < 0) { if (len < 0) {
@ -200,7 +310,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
memset(&from, 0, sizeof(from)); memset(&from, 0, sizeof(from));
fromlen = sizeof(from); fromlen = sizeof(from);
tv.tv_sec = 5; // BB_TFPT_TIMEOUT = 5 tv.tv_sec = TFTP_TIMEOUT;
tv.tv_usec = 0; tv.tv_usec = 0;
FD_ZERO(&rfds); FD_ZERO(&rfds);
@ -261,9 +371,76 @@ static inline int tftp(const int cmd, const struct hostent *host,
printf("received %d bytes: %04x %04x\n", len, opcode, tmp); printf("received %d bytes: %04x %04x\n", len, opcode, tmp);
#endif #endif
if (cmd_get && (opcode == 3)) { // data packet == 3 if (opcode == TFTP_ERROR) {
char *msg = NULL;
if (buf[4] != '\0') {
msg = &buf[4];
buf[tftp_bufsize - 1] = '\0';
} else if (tmp < (sizeof(tftp_error_msg)
/ sizeof(char *))) {
msg = (char *) tftp_error_msg[tmp];
}
if (msg) {
error_msg("server says: %s", msg);
}
break;
}
#ifdef BB_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,
"blksize");
if (res) {
int foo = atoi(res);
if (tftp_blocksize_check(foo,
tftp_bufsize - 4)) {
if (cmd_put) {
opcode = TFTP_DATA;
}
else {
opcode = TFTP_ACK;
}
#ifdef BB_FEATURE_TFTP_DEBUG
printf("using blksize %u\n");
#endif
tftp_bufsize = foo + 4;
block_nr = 0;
continue;
}
}
/* FIXME:
* we should send ERROR 8 */
error_msg("bad server option");
break;
}
error_msg("warning: blksize not supported by server"
" - reverting to 512");
tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
}
#endif
if (cmd_get && (opcode == TFTP_DATA)) {
if (tmp == block_nr) { if (tmp == block_nr) {
len = write(localfd, &buf[4], len - 4); len = write(localfd, &buf[4], len - 4);
if (len < 0) { if (len < 0) {
@ -275,43 +452,30 @@ static inline int tftp(const int cmd, const struct hostent *host,
finished++; finished++;
} }
opcode = 4; // acknowledgement = 4 opcode = TFTP_ACK;
continue; continue;
} }
} }
if (cmd_put && (opcode == 4)) { // acknowledgement = 4 if (cmd_put && (opcode == TFTP_ACK)) {
if (tmp == (block_nr - 1)) { if (tmp == (block_nr - 1)) {
if (finished) { if (finished) {
break; break;
} }
opcode = 3; // data packet == 3 opcode = TFTP_DATA;
continue; continue;
} }
} }
if (opcode == 5) { // error code == 5
char *msg = NULL;
if (buf[4] != '\0') {
msg = &buf[4];
buf[tftp_bufsize - 1] = '\0';
} else if (tmp < (sizeof(tftp_error_msg) / sizeof(char *))) {
msg = (char *) tftp_error_msg[tmp];
}
if (msg) {
error_msg("server says: %s", msg);
}
break;
}
} }
#ifdef BB_FEATURE_CLEAN_UP
close(socketfd); close(socketfd);
RELEASE_BB_BUFFER(buf);
#endif
return finished ? EXIT_SUCCESS : EXIT_FAILURE; return finished ? EXIT_SUCCESS : EXIT_FAILURE;
} }
@ -326,13 +490,38 @@ int tftp_main(int argc, char **argv)
int flags = 0; int flags = 0;
int opt; int opt;
int result; int result;
int blocksize = 512; int blocksize = TFTP_BLOCKSIZE_DEFAULT;
while ((opt = getopt(argc, argv, "b:gpl:r:")) != -1) { /* figure out what to pass to getopt */
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
#define BS "b:"
#else
#define BS
#endif
#ifdef BB_FEATURE_TFTP_GET
#define GET "g"
#else
#define GET
#endif
#ifdef BB_FEATURE_TFTP_PUT
#define PUT "p"
#else
#define PUT
#endif
while ((opt = getopt(argc, argv, BS GET PUT "l:r:")) != -1) {
switch (opt) { switch (opt) {
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
case 'b': case 'b':
blocksize = atoi(optarg); blocksize = atoi(optarg);
if (!tftp_blocksize_check(blocksize, 0)) {
return EXIT_FAILURE;
}
break; break;
#endif
#ifdef BB_FEATURE_TFTP_GET #ifdef BB_FEATURE_TFTP_GET
case 'g': case 'g':
cmd = tftp_cmd_get; cmd = tftp_cmd_get;
@ -370,14 +559,16 @@ int tftp_main(int argc, char **argv)
} }
#ifdef BB_FEATURE_TFTP_DEBUG #ifdef BB_FEATURE_TFTP_DEBUG
printf("using server \"%s\", serverfile \"%s\"," printf("using server \"%s\", remotefile \"%s\", "
"localfile \"%s\".\n", "localfile \"%s\".\n",
inet_ntoa(*((struct in_addr *) host->h_addr)), inet_ntoa(*((struct in_addr *) host->h_addr)),
remotefile, localfile); remotefile, localfile);
#endif #endif
result = tftp(cmd, host, remotefile, fd, port, blocksize); result = tftp(cmd, host, remotefile, fd, port, blocksize);
close(fd);
#ifdef BB_FEATURE_CLEAN_UP
close(fd);
#endif
return(result); return(result);
} }

293
tftp.c
View File

@ -3,7 +3,8 @@
/* */ /* */
/* A simple tftp client for busybox. */ /* A simple tftp client for busybox. */
/* Tries to follow RFC1350. */ /* Tries to follow RFC1350. */
/* Only "octet" mode and 512-byte data blocks are supported. */ /* Only "octet" mode supported. */
/* Optional blocksize negotiation (RFC2347 + RFC2348) */
/* */ /* */
/* Copyright (C) 2001 Magnus Damm <damm@opensource.se> */ /* Copyright (C) 2001 Magnus Damm <damm@opensource.se> */
/* */ /* */
@ -47,6 +48,18 @@
//#define BB_FEATURE_TFTP_DEBUG //#define BB_FEATURE_TFTP_DEBUG
#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */
#define TFTP_TIMEOUT 5 /* seconds */
/* opcodes we support */
#define TFTP_RRQ 1
#define TFTP_WRQ 2
#define TFTP_DATA 3
#define TFTP_ACK 4
#define TFTP_ERROR 5
#define TFTP_OACK 6
static const char *tftp_error_msg[] = { static const char *tftp_error_msg[] = {
"Undefined error", "Undefined error",
"File not found", "File not found",
@ -61,8 +74,71 @@ static const char *tftp_error_msg[] = {
const int tftp_cmd_get = 1; const int tftp_cmd_get = 1;
const int tftp_cmd_put = 2; const int tftp_cmd_put = 2;
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
static int tftp_blocksize_check(int blocksize, int bufsize)
{
/* Check if the blocksize is valid:
* RFC2348 says between 8 and 65464,
* but our implementation makes it impossible
* to use blocksizes smaller than 22 octets.
*/
if ((bufsize && (blocksize > bufsize)) ||
(blocksize < 8) || (blocksize > 65464)) {
error_msg("bad blocksize");
return 0;
}
return blocksize;
}
static char *tftp_option_get(char *buf, int len, 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;
}
}
if (k >= len) {
break;
}
if (opt_val == 0) {
if (strcasecmp(buf, option) == 0) {
opt_found = 1;
}
}
else {
if (opt_found) {
return buf;
}
}
k++;
buf += k;
len -= k;
opt_val ^= 1;
}
return NULL;
}
#endif
static inline int tftp(const int cmd, const struct hostent *host, static inline int tftp(const int cmd, const struct hostent *host,
const char *serverfile, int localfd, const int port, int tftp_bufsize) const char *remotefile, int localfd, const int port, int tftp_bufsize)
{ {
const int cmd_get = cmd & tftp_cmd_get; const int cmd_get = cmd & tftp_cmd_get;
const int cmd_put = cmd & tftp_cmd_put; const int cmd_put = cmd & tftp_cmd_put;
@ -81,7 +157,12 @@ static inline int tftp(const int cmd, const struct hostent *host,
int finished = 0; int finished = 0;
int timeout = bb_tftp_num_retries; int timeout = bb_tftp_num_retries;
int block_nr = 1; int block_nr = 1;
RESERVE_BB_BUFFER(buf, tftp_bufsize + 4); // Why 4 ?
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
int want_option_ack = 0;
#endif
RESERVE_BB_BUFFER(buf, tftp_bufsize + 4); /* Opcode + Block # + Data */
tftp_bufsize += 4; tftp_bufsize += 4;
@ -103,50 +184,79 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* build opcode */ /* build opcode */
if (cmd_get) { if (cmd_get) {
opcode = 1; // read request = 1 opcode = TFTP_RRQ;
} }
if (cmd_put) { if (cmd_put) {
opcode = 2; // write request = 2 opcode = TFTP_WRQ;
} }
while (1) { while (1) {
/* build packet of type "opcode" */
cp = buf; cp = buf;
/* first create the opcode part */
*((unsigned short *) cp) = htons(opcode); *((unsigned short *) cp) = htons(opcode);
cp += 2; cp += 2;
/* add filename and mode */ /* add filename and mode */
if ((cmd_get && (opcode == 1)) || // read request = 1 if ((cmd_get && (opcode == TFTP_RRQ)) ||
(cmd_put && (opcode == 2))) { // write request = 2 (cmd_put && (opcode == TFTP_WRQ))) {
int too_long = 0;
/* what is this trying to do ? */ /* see if the filename fits into buf */
while (cp != &buf[tftp_bufsize - 1]) { /* and fill in packet */
if ((*cp = *serverfile++) == '\0')
break; len = strlen(remotefile) + 1;
cp++;
if ((cp + len) >= &buf[tftp_bufsize - 1]) {
too_long = 1;
} }
/* and this ? */ else {
if ((*cp != '\0') || (&buf[tftp_bufsize - 1] - cp) < 7) { safe_strncpy(cp, remotefile, len);
error_msg("too long server-filename"); cp += len;
}
if (too_long || ((&buf[tftp_bufsize - 1] - cp) < 6)) {
error_msg("too long remote-filename");
break; break;
} }
memcpy(cp + 1, "octet", 6); /* add "mode" part of the package */
cp += 7;
memcpy(cp, "octet", 6);
cp += 6;
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
len = tftp_bufsize - 4; /* data block size */
if (len != TFTP_BLOCKSIZE_DEFAULT) {
if ((&buf[tftp_bufsize - 1] - cp) < 15) {
error_msg("too long remote-filename");
break;
}
/* add "blksize" + number of blocks */
memcpy(cp, "blksize", 8);
cp += 8;
cp += snprintf(cp, 6, "%d", len) + 1;
want_option_ack = 1;
}
#endif
} }
/* add ack and data */ /* add ack and data */
if ((cmd_get && (opcode == 4)) || // acknowledgement = 4 if ((cmd_get && (opcode == TFTP_ACK)) ||
(cmd_put && (opcode == 3))) { // data packet == 3 (cmd_put && (opcode == TFTP_DATA))) {
*((unsigned short *) cp) = htons(block_nr); *((unsigned short *) cp) = htons(block_nr);
@ -154,7 +264,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
block_nr++; block_nr++;
if (cmd_put && (opcode == 3)) { // data packet == 3 if (cmd_put && (opcode == TFTP_DATA)) {
len = read(localfd, cp, tftp_bufsize - 4); len = read(localfd, cp, tftp_bufsize - 4);
if (len < 0) { if (len < 0) {
@ -200,7 +310,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
memset(&from, 0, sizeof(from)); memset(&from, 0, sizeof(from));
fromlen = sizeof(from); fromlen = sizeof(from);
tv.tv_sec = 5; // BB_TFPT_TIMEOUT = 5 tv.tv_sec = TFTP_TIMEOUT;
tv.tv_usec = 0; tv.tv_usec = 0;
FD_ZERO(&rfds); FD_ZERO(&rfds);
@ -261,9 +371,76 @@ static inline int tftp(const int cmd, const struct hostent *host,
printf("received %d bytes: %04x %04x\n", len, opcode, tmp); printf("received %d bytes: %04x %04x\n", len, opcode, tmp);
#endif #endif
if (cmd_get && (opcode == 3)) { // data packet == 3 if (opcode == TFTP_ERROR) {
char *msg = NULL;
if (buf[4] != '\0') {
msg = &buf[4];
buf[tftp_bufsize - 1] = '\0';
} else if (tmp < (sizeof(tftp_error_msg)
/ sizeof(char *))) {
msg = (char *) tftp_error_msg[tmp];
}
if (msg) {
error_msg("server says: %s", msg);
}
break;
}
#ifdef BB_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,
"blksize");
if (res) {
int foo = atoi(res);
if (tftp_blocksize_check(foo,
tftp_bufsize - 4)) {
if (cmd_put) {
opcode = TFTP_DATA;
}
else {
opcode = TFTP_ACK;
}
#ifdef BB_FEATURE_TFTP_DEBUG
printf("using blksize %u\n");
#endif
tftp_bufsize = foo + 4;
block_nr = 0;
continue;
}
}
/* FIXME:
* we should send ERROR 8 */
error_msg("bad server option");
break;
}
error_msg("warning: blksize not supported by server"
" - reverting to 512");
tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
}
#endif
if (cmd_get && (opcode == TFTP_DATA)) {
if (tmp == block_nr) { if (tmp == block_nr) {
len = write(localfd, &buf[4], len - 4); len = write(localfd, &buf[4], len - 4);
if (len < 0) { if (len < 0) {
@ -275,43 +452,30 @@ static inline int tftp(const int cmd, const struct hostent *host,
finished++; finished++;
} }
opcode = 4; // acknowledgement = 4 opcode = TFTP_ACK;
continue; continue;
} }
} }
if (cmd_put && (opcode == 4)) { // acknowledgement = 4 if (cmd_put && (opcode == TFTP_ACK)) {
if (tmp == (block_nr - 1)) { if (tmp == (block_nr - 1)) {
if (finished) { if (finished) {
break; break;
} }
opcode = 3; // data packet == 3 opcode = TFTP_DATA;
continue; continue;
} }
} }
if (opcode == 5) { // error code == 5
char *msg = NULL;
if (buf[4] != '\0') {
msg = &buf[4];
buf[tftp_bufsize - 1] = '\0';
} else if (tmp < (sizeof(tftp_error_msg) / sizeof(char *))) {
msg = (char *) tftp_error_msg[tmp];
}
if (msg) {
error_msg("server says: %s", msg);
}
break;
}
} }
#ifdef BB_FEATURE_CLEAN_UP
close(socketfd); close(socketfd);
RELEASE_BB_BUFFER(buf);
#endif
return finished ? EXIT_SUCCESS : EXIT_FAILURE; return finished ? EXIT_SUCCESS : EXIT_FAILURE;
} }
@ -326,13 +490,38 @@ int tftp_main(int argc, char **argv)
int flags = 0; int flags = 0;
int opt; int opt;
int result; int result;
int blocksize = 512; int blocksize = TFTP_BLOCKSIZE_DEFAULT;
while ((opt = getopt(argc, argv, "b:gpl:r:")) != -1) { /* figure out what to pass to getopt */
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
#define BS "b:"
#else
#define BS
#endif
#ifdef BB_FEATURE_TFTP_GET
#define GET "g"
#else
#define GET
#endif
#ifdef BB_FEATURE_TFTP_PUT
#define PUT "p"
#else
#define PUT
#endif
while ((opt = getopt(argc, argv, BS GET PUT "l:r:")) != -1) {
switch (opt) { switch (opt) {
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
case 'b': case 'b':
blocksize = atoi(optarg); blocksize = atoi(optarg);
if (!tftp_blocksize_check(blocksize, 0)) {
return EXIT_FAILURE;
}
break; break;
#endif
#ifdef BB_FEATURE_TFTP_GET #ifdef BB_FEATURE_TFTP_GET
case 'g': case 'g':
cmd = tftp_cmd_get; cmd = tftp_cmd_get;
@ -370,14 +559,16 @@ int tftp_main(int argc, char **argv)
} }
#ifdef BB_FEATURE_TFTP_DEBUG #ifdef BB_FEATURE_TFTP_DEBUG
printf("using server \"%s\", serverfile \"%s\"," printf("using server \"%s\", remotefile \"%s\", "
"localfile \"%s\".\n", "localfile \"%s\".\n",
inet_ntoa(*((struct in_addr *) host->h_addr)), inet_ntoa(*((struct in_addr *) host->h_addr)),
remotefile, localfile); remotefile, localfile);
#endif #endif
result = tftp(cmd, host, remotefile, fd, port, blocksize); result = tftp(cmd, host, remotefile, fd, port, blocksize);
close(fd);
#ifdef BB_FEATURE_CLEAN_UP
close(fd);
#endif
return(result); return(result);
} }

12
usage.h
View File

@ -1615,13 +1615,19 @@
#else #else
#define USAGE_TFTP_PUT(a) #define USAGE_TFTP_PUT(a)
#endif #endif
#ifdef BB_FEATURE_TFTP_BLOCKSIZE
#define USAGE_TFTP_BS(a) a
#else
#define USAGE_TFTP_BS(a)
#endif
#define tftp_trivial_usage \ #define tftp_trivial_usage \
"[OPTION]... HOST [PORT]" "[OPTION]... HOST [PORT]"
#define tftp_full_usage \ #define tftp_full_usage \
"Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \ "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
"Options:\n" \ "Options:\n" \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \ "\t-l FILE\tLocal FILE.\n" \
"\t-r FILE\tRemote FILE.\n" \
USAGE_TFTP_GET( \ USAGE_TFTP_GET( \
"\t-g\tGet file.\n" \ "\t-g\tGet file.\n" \
) \ ) \
@ -1629,7 +1635,9 @@
USAGE_TFTP_PUT( \ USAGE_TFTP_PUT( \
"\t-p\tPut file.\n" \ "\t-p\tPut file.\n" \
) \ ) \
"\t-r FILE\tTransfer remote FILE.\n" USAGE_TFTP_BS( \
"\t-b SIZE\tTransfer blocks of SIZE octets.\n" \
)
#define touch_trivial_usage \ #define touch_trivial_usage \
"[-c] FILE [FILE ...]" "[-c] FILE [FILE ...]"