mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 00:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some TFTP cleanups

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2018-10-08 11:41:51 +02:00
parent b2713601f0
commit 7ba69d875c
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Filelists.cmake
View File

@ -206,7 +206,7 @@ set(lwipnetbios_SRCS
# TFTP server files # TFTP server files
set(lwiptftp_SRCS set(lwiptftp_SRCS
${LWIP_DIR}/src/apps/tftp/tftp_server.c ${LWIP_DIR}/src/apps/tftp/tftp.c
) )
# MQTT client files # MQTT client files

30
src/Filelists.mk
View File

@ -1,8 +1,8 @@
# #
# Copyright (c) 2001, 2002 Swedish Institute of Computer Science. # Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without modification, # Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met: # are permitted provided that the following conditions are met:
# #
# 1. Redistributions of source code must retain the above copyright notice, # 1. Redistributions of source code must retain the above copyright notice,
@ -11,21 +11,21 @@
# this list of conditions and the following disclaimer in the documentation # this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution. # and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products # 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission. # derived from this software without specific prior written permission.
# #
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
# SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, # SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
# OF SUCH DAMAGE. # OF SUCH DAMAGE.
# #
# This file is part of the lwIP TCP/IP stack. # This file is part of the lwIP TCP/IP stack.
# #
# Author: Adam Dunkels <adam@sics.se> # Author: Adam Dunkels <adam@sics.se>
# #
@ -183,7 +183,7 @@ MDNSFILES=$(LWIPDIR)/apps/mdns/mdns.c
NETBIOSNSFILES=$(LWIPDIR)/apps/netbiosns/netbiosns.c NETBIOSNSFILES=$(LWIPDIR)/apps/netbiosns/netbiosns.c
# TFTPFILES: TFTP client/server files # TFTPFILES: TFTP client/server files
TFTPFILES=$(LWIPDIR)/apps/tftp/tftp_common.c TFTPFILES=$(LWIPDIR)/apps/tftp/tftp.c
# MQTTFILES: MQTT client files # MQTTFILES: MQTT client files
MQTTFILES=$(LWIPDIR)/apps/mqtt/mqtt.c MQTTFILES=$(LWIPDIR)/apps/mqtt/mqtt.c

0
src/apps/tftp/tftp_common.c → src/apps/tftp/tftp.c
View File

5
src/include/lwip/apps/tftp_client.h
View File

@ -5,7 +5,7 @@
* *
*/ */
/* /*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification,are permitted provided that the following conditions are met: * modification,are permitted provided that the following conditions are met:
* *
@ -37,4 +37,7 @@
#include "lwip/apps/tftp_common.h" #include "lwip/apps/tftp_common.h"
err_t tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode);
err_t tftp_put(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode);
#endif /* LWIP_HDR_APPS_TFTP_CLIENT_H */ #endif /* LWIP_HDR_APPS_TFTP_CLIENT_H */

6
src/include/lwip/apps/tftp_common.h
View File

@ -11,7 +11,7 @@
* *
*/ */
/* /*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification,are permitted provided that the following conditions are met: * modification,are permitted provided that the following conditions are met:
* *
@ -68,7 +68,7 @@ struct tftp_context {
*/ */
void (*close)(void* handle); void (*close)(void* handle);
/** /**
* Read from file * Read from file
* @param handle File handle returned by open() * @param handle File handle returned by open()
* @param buf Target buffer to copy read data to * @param buf Target buffer to copy read data to
* @param bytes Number of bytes to copy to buf * @param bytes Number of bytes to copy to buf
@ -96,8 +96,6 @@ struct tftp_context {
err_t tftp_init(const struct tftp_context* ctx); err_t tftp_init(const struct tftp_context* ctx);
void tftp_cleanup(void); void tftp_cleanup(void);
err_t tftp_get(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode);
err_t tftp_put(void* handle, const ip_addr_t *addr, u16_t port, const char* fname, const char* mode);
#ifdef __cplusplus #ifdef __cplusplus
} }