sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSH TFTP get command: Wrong file name used for the destination. From Lazlo

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-10 18:37:43 -06:00
parent 0bc4962941
commit 308818b718
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netutils/tftpc/tftpc_get.c
View File

@ -145,11 +145,12 @@ static inline int tftp_parsedatapacket(const uint8_t *packet,
* *
****************************************************************************/ ****************************************************************************/
int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary) int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
bool binary)
{ {
struct sockaddr_in server; /* The address of the TFTP server */ struct sockaddr_in server; /* The address of the TFTP server */
struct sockaddr_in from; /* The address the last UDP message recv'd from */ struct sockaddr_in from; /* The address the last UDP message recv'd from */
uint8_t *packet; /* Allocated memory to hold one packet */ FAR uint8_t *packet; /* Allocated memory to hold one packet */
uint16_t blockno = 0; /* The current transfer block number */ uint16_t blockno = 0; /* The current transfer block number */
uint16_t opcode; /* Received opcode */ uint16_t opcode; /* Received opcode */
uint16_t rblockno; /* Received block number */ uint16_t rblockno; /* Received block number */
@ -164,7 +165,7 @@ int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary)
/* Allocate the buffer to used for socket/disk I/O */ /* Allocate the buffer to used for socket/disk I/O */
packet = (uint8_t*)zalloc(TFTP_IOBUFSIZE); packet = (FAR uint8_t*)zalloc(TFTP_IOBUFSIZE);
if (!packet) if (!packet)
{ {
ndbg("packet memory allocation failure\n"); ndbg("packet memory allocation failure\n");

2
nshlib/nsh_netcmds.c
View File

@ -504,7 +504,7 @@ int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* Get the full path to the local file */ /* Get the full path to the local file */
fullpath = nsh_getfullpath(vtbl, args.srcpath); fullpath = nsh_getfullpath(vtbl, args.destpath);
/* Then perform the TFTP get operation */ /* Then perform the TFTP get operation */