Merge pull request #806 from armink/fix_lwip_tftp

Fix lwip 2.0.2 TFTP server
This commit is contained in:
Bernard Xiong 2017-08-18 07:55:00 +08:00 committed by GitHub
commit a4705e582b
3 changed files with 86 additions and 2 deletions

View File

@ -79,6 +79,7 @@ if GetDepend(['RT_LWIP_PPP']):
# For testing apps
if GetDepend(['RT_USING_NETUTILS']):
src += Glob('./apps/*.c')
stc += Glob('./src/apps/tftp/*.c')
group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path)

View File

@ -0,0 +1,83 @@
/*
* File : tftp_server.c
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
* 2017-08-17 armink first version.
*/
#include <rtthread.h>
#include <dfs_posix.h>
#include <lwip/apps/tftp_server.h>
static struct tftp_context ctx;
static void* tftp_open(const char* fname, const char* mode, u8_t write)
{
int fd = -1;
if (!rt_strcmp(mode, "octet"))
{
if (write)
{
fd = open(fname, O_WRONLY | O_CREAT, 0);
}
else
{
fd = open(fname, O_RDONLY, 0);
}
}
else
{
rt_kprintf("tftp: No support this mode(%s).", mode);
}
return (void *) fd;
}
static int tftp_write(void* handle, struct pbuf* p)
{
int fd = (int) handle;
return write(fd, p->payload, p->len);
}
#if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH)
#include <finsh.h>
static void tftp_server(uint8_t argc, char **argv)
{
ctx.open = tftp_open;
ctx.close = (void (*)(void *)) close;
ctx.read = (int (*)(void *, void *, int)) read;
ctx.write = tftp_write;
if (tftp_init(&ctx) == ERR_OK)
{
rt_kprintf("TFTP server start successfully.\n");
}
else
{
rt_kprintf("TFTP server start failed.\n");
}
}
MSH_CMD_EXPORT(tftp_server, start tftp server.);
#endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */

View File

@ -226,8 +226,8 @@ recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16
case PP_HTONS(TFTP_WRQ):
{
const char tftp_null = 0;
char filename[TFTP_MAX_FILENAME_LEN];
char mode[TFTP_MAX_MODE_LEN];
char filename[TFTP_MAX_FILENAME_LEN] = { 0 };
char mode[TFTP_MAX_MODE_LEN] = { 0 };
u16_t filename_end_offset;
u16_t mode_end_offset;