abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-10 09:33:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve TFTP implementation

Browse Source 
- implement server/client mode (API is nicer to use)
- Increase TFTP_MAX_MODE_LEN to be able to contain "netascii" transfer mode
- Adapt tftp_example to changes
This commit is contained in:
Dirk Ziegelmeier
2018-10-08 12:45:29 +02:00
parent de81e8bf19
commit 6c2fd2d25d
6 changed files with 82 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/apps/tftp/tftp.c
View File

@@ -91,6 +91,7 @@ struct tftp_state {
};
static struct tftp_state tftp_state;
static u8_t tftp_mode;
static void tftp_tmr(void *arg);
@@ -261,6 +262,11 @@ recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16
break;
}
if ((tftp_mode & LWIP_TFTP_MODE_SERVER) == 0) {
send_error(addr, port, TFTP_ERROR_ACCESS_VIOLATION, "TFTP server not enabled");
break;
}
sys_timeout(TFTP_TIMER_MSECS, tftp_tmr, NULL);
/* find \0 in pbuf -> end of filename string */
@@ -420,12 +426,13 @@ tftp_tmr(void *arg)
}
}
/** @ingroup tftp
/**
* Initialize TFTP client/server.
* @param mode TFTP mode (client/server)
* @param ctx TFTP callback struct
*/
err_t
tftp_init(const struct tftp_context *ctx)
tftp_init_common(u8_t mode, const struct tftp_context *ctx)
{
err_t ret;
@@ -435,6 +442,8 @@ tftp_init(const struct tftp_context *ctx)
return ERR_MEM;
}
tftp_mode = mode;
ret = udp_bind(pcb, IP_ANY_TYPE, TFTP_PORT);
if (ret != ERR_OK) {
udp_remove(pcb);
@@ -453,6 +462,26 @@ tftp_init(const struct tftp_context *ctx)
return ERR_OK;
}
/** @ingroup tftp
* Initialize TFTP server.
* @param ctx TFTP callback struct
*/
err_t
tftp_init_server(const struct tftp_context *ctx)
{
return tftp_init_common(LWIP_TFTP_MODE_SERVER, ctx);
}
/** @ingroup tftp
* Initialize TFTP client.
* @param ctx TFTP callback struct
*/
err_t
tftp_init_client(u8_t mode, const struct tftp_context *ctx)
{
return tftp_init_common(LWIP_TFTP_MODE_CLIENT, ctx);
}
/** @ingroup tftp
* Deinitialize ("turn off") TFTP client/server.
*/
@@ -465,7 +494,10 @@ void tftp_cleanup(void)
}
err_t
tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode) {
tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode)
{
LWIP_ERROR("TFTP client is not enabled (tftp_init)", (tftp_mode & LWIP_TFTP_MODE_CLIENT) == 0, return ERR_VAL);
tftp_state.handle = handle;
tftp_state.blknum = 1;
tftp_state.mode_write = 1; // We want to receive data
@@ -474,7 +506,10 @@ tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, con
}
err_t
tftp_put(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode) {
tftp_put(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode)
{
LWIP_ERROR("TFTP client is not enabled (tftp_init)", (tftp_mode & LWIP_TFTP_MODE_CLIENT) == 0, return ERR_VAL);
tftp_state.handle = handle;
tftp_state.blknum = 1;
tftp_state.mode_write = 0; // We want to send data