[lwip-devel] [PATCHv6 05/14] net/lwip: implement tftp cmd

[Maxim Uvarov]

Implement function for dhcp command with lwIP variant. Usage and output is
the same as the original command. This code called by compatibility code
between U-Boot and lwIP.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 net/lwip/Makefile              |   1 +
 net/lwip/apps/tftp/Makefile    |  16 ++++
 net/lwip/apps/tftp/lwip-tftp.c | 129 +++++++++++++++++++++++++++++++++
 3 files changed, 146 insertions(+)
 create mode 100644 net/lwip/apps/tftp/Makefile
 create mode 100644 net/lwip/apps/tftp/lwip-tftp.c

diff --git a/net/lwip/Makefile b/net/lwip/Makefile
index 59323fb325..0337d82cf5 100644
--- a/net/lwip/Makefile
+++ b/net/lwip/Makefile
@@ -67,3 +67,4 @@ obj-$(CONFIG_NET) += port/sys-arch.o
 
 obj-$(CONFIG_CMD_DHCP) += apps/dhcp/lwip-dhcp.o
 obj-$(CONFIG_CMD_DNS) += apps/dns/lwip-dns.o
+obj-$(CONFIG_CMD_TFTPBOOT) += apps/tftp/
diff --git a/net/lwip/apps/tftp/Makefile b/net/lwip/apps/tftp/Makefile
new file mode 100644
index 0000000000..0e50fcad45
--- /dev/null
+++ b/net/lwip/apps/tftp/Makefile
@@ -0,0 +1,16 @@
+
+ccflags-y += -I$(srctree)/net/lwip/port/include
+ccflags-y += -I$(srctree)/net/lwip/lwip-external/src/include 
-I$(srctree)/net/lwip
+ccflags-y += -I$(obj)
+
+$(obj)/tftp.o: $(obj)/tftp.c
+.PHONY: $(obj)/tftp.c
+$(obj)/tftp.c:
+       cp $(srctree)/net/lwip/lwip-external/src/apps/tftp/tftp.c $(obj)/tftp.c
+       cp 
$(srctree)/net/lwip/lwip-external/src/include/lwip/apps/tftp_client.h 
$(obj)/tftp_client.h
+       cp 
$(srctree)/net/lwip/lwip-external/src/include/lwip/apps/tftp_common.h 
$(obj)/tftp_common.h
+       cp 
$(srctree)/net/lwip/lwip-external/contrib/examples/tftp/tftp_example.h 
$(obj)/tftp_example.h
+
+obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o
+obj-$(CONFIG_CMD_TFTPBOOT) += lwip-tftp.o
+
diff --git a/net/lwip/apps/tftp/lwip-tftp.c b/net/lwip/apps/tftp/lwip-tftp.c
new file mode 100644
index 0000000000..290229cb85
--- /dev/null
+++ b/net/lwip/apps/tftp/lwip-tftp.c
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/*
+ * (C) Copyright 2023 Linaro Ltd. <maxim.uvarov@linaro.org>
+ */
+
+#include <common.h>
+#include <command.h>
+#include <console.h>
+#include <bootstage.h>
+
+#include "lwip/apps/tftp_client.h"
+#include "lwip/apps/tftp_server.h"
+#include <tftp_example.h>
+
+#include <string.h>
+
+#include <net/ulwip.h>
+
+#if LWIP_UDP
+
+static ulong daddr;
+static ulong size;
+
+static void *tftp_open(const char *fname, const char *mode, u8_t is_write)
+{
+       LWIP_UNUSED_ARG(mode);
+       return NULL;
+}
+
+static void tftp_close(void *handle)
+{
+       log_info("\ndone\n");
+       log_info("Bytes transferred = %ld (0x%lx hex)\n", size, size);
+
+       bootstage_mark_name(BOOTSTAGE_KERNELREAD_STOP, "tftp_done");
+       env_set_ulong("filesize", size);
+       ulwip_exit(0);
+}
+
+static int tftp_read(void *handle, void *buf, int bytes)
+{
+       return 0;
+}
+
+static int tftp_write(void *handle, struct pbuf *p)
+{
+       struct pbuf *q;
+
+       for (q = p; q != NULL; q = q->next) {
+               memcpy((void *)daddr, q->payload, q->len);
+               daddr += q->len;
+               size += q->len;
+               log_info("#");
+       }
+
+       return 0;
+}
+
+static void tftp_error(void *handle, int err, const char *msg, int size)
+{
+       char message[100];
+
+       LWIP_UNUSED_ARG(handle);
+
+       memset(message, 0, sizeof(message));
+       MEMCPY(message, msg, LWIP_MIN(sizeof(message)-1, (size_t)size));
+
+       log_info("TFTP error: %d (%s)", err, message);
+}
+
+static const struct tftp_context tftp = {
+       tftp_open,
+       tftp_close,
+       tftp_read,
+       tftp_write,
+       tftp_error
+};
+
+int ulwip_tftp(ulong addr, char *fname)
+{
+       void *f = (void *)0x1; /* unused fake file handle*/
+       err_t err;
+       ip_addr_t srv;
+       int ret;
+       char *server_ip;
+
+       if (!fname || addr == 0)
+               return CMD_RET_FAILURE;
+
+       size = 0;
+       daddr = addr;
+       server_ip = env_get("serverip");
+       if (!server_ip) {
+               log_err("error: serverip variable has to be set\n");
+               return CMD_RET_FAILURE;
+       }
+
+       ret = ipaddr_aton(server_ip, &srv);
+       if (!ret) {
+               log_err("error: ipaddr_aton\n");
+               return CMD_RET_FAILURE;
+       }
+
+       log_info("TFTP from server %s; our IP address is %s\n",
+                server_ip, env_get("ipaddr"));
+       log_info("Filename '%s'.\n", fname);
+       log_info("Load address: 0x%lx\n", daddr);
+       log_info("Loading:");
+
+       bootstage_mark_name(BOOTSTAGE_KERNELREAD_START, "tftp_start");
+
+       err = tftp_init_client(&tftp);
+       if (!(err == ERR_OK || err == ERR_USE))
+               log_err("tftp_init_client err: %d\n", err);
+
+       err = tftp_get(f, &srv, TFTP_PORT, fname, TFTP_MODE_OCTET);
+       /* might return different errors, like routing problems */
+       if (err != ERR_OK) {
+               log_err("tftp_get err=%d\n", err);
+               return CMD_RET_FAILURE;
+       }
+
+       env_set_hex("fileaddr", addr);
+       return err;
+}
+#else
+#error "UDP has to be supported"
+#endif /* LWIP_UDP */
-- 
2.30.2