mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 07:12:54 +08:00
Add get and put commands to NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@880 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -323,7 +323,7 @@ int tftpget(const char *remote, const char *local, in_addr_t addr, boolean binar
|
||||
*/
|
||||
|
||||
#if CONFIG_NETUTILS_TFTP_ACKPACKETS > 1
|
||||
if (ndatabytes < blockno != lastacked)
|
||||
if (ndatabytes < TFTP_DATASIZE && blockno != lastacked)
|
||||
{
|
||||
len = tftp_mkackpacket(packet, blockno);
|
||||
ret = tftp_sendto(sd, packet, len, &server);
|
||||
|
||||
@@ -402,7 +402,7 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, boolean binar
|
||||
#if CONFIG_NETUTILS_TFTP_ACKPACKETS > 1
|
||||
/* Construct the next data packet */
|
||||
|
||||
packetlen = tftp_mkdatapacket(fd, offset[tail], packet, blockno);
|
||||
packetlen = tftp_mkdatapacket(fd, offsets[tail], packet, blockno);
|
||||
if (packetlen < 0)
|
||||
{
|
||||
goto errout_with_sd;
|
||||
@@ -474,7 +474,6 @@ int tftpput(const char *local, const char *remote, in_addr_t addr, boolean binar
|
||||
#if CONFIG_NETUTILS_TFTP_ACKPACKETS > 1
|
||||
if (blockno - hblockno >= CONFIG_NETUTILS_TFTP_ACKPACKETS || eof)
|
||||
{
|
||||
uint16 rblockno;
|
||||
int ndx;
|
||||
|
||||
/* Get the next ACK from the wire */
|
||||
|
||||
Reference in New Issue
Block a user