[lwip-devel] [PATCHv6 07/14] net/lwip: implement ping cmd

[Maxim Uvarov]

Implement function for ping 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. ping uses lwIP contrib/apps/ping/ping.c code.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 include/net/lwip.h             | 28 ++++++++++++++++++++++++-
 net/lwip/Makefile              |  1 +
 net/lwip/apps/ping/Makefile    | 11 ++++++++++
 net/lwip/apps/ping/lwip_ping.c | 37 ++++++++++++++++++++++++++++++++++
 net/lwip/apps/ping/lwip_ping.h | 15 ++++++++++++++
 net/lwip/apps/ping/ping.h      | 19 +++++++++++++++++
 6 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 net/lwip/apps/ping/Makefile
 create mode 100644 net/lwip/apps/ping/lwip_ping.c
 create mode 100644 net/lwip/apps/ping/lwip_ping.h
 create mode 100644 net/lwip/apps/ping/ping.h

diff --git a/include/net/lwip.h b/include/net/lwip.h
index f1f2c94fc2..e928676b36 100644
--- a/include/net/lwip.h
+++ b/include/net/lwip.h
@@ -2,7 +2,8 @@
 
 int do_lwip_dns(struct cmd_tbl *cmdtp, int flag, int argc,
                char *const argv[]);
-
+int do_lwip_ping(struct cmd_tbl *cmdtp, int flag, int argc,
+                char *const argv[]);
 /*
 * This function creates the DNS request to resolve a domain host name. Function
 * can return immediately if previous request was cached or it might require
@@ -38,3 +39,28 @@ int ulwip_dhcp(void);
 *         !0 if error
 */
 int ulwip_wget(ulong addr, char *url);
+
+/**
+ * ulwip_tftp() - load file with tftp
+ *
+ * Load file with tftp to specific address
+ *
+ * @param addr - address to store downloaded file
+ * @param filename - file name on remote tftp server to download
+ *
+ *
+ * @return 0 if success, !0 if error
+ */
+int ulwip_tftp(ulong addr, const char *filename);
+
+/*
+* This function creates the ping for  address provided in parameters.
+* After this function you need to invoke the polling
+* loop to process network communication.
+*
+*
+* @ping_addr  start address to download result
+* Return: 0 for success
+*         !0 if error
+*/
+int ulwip_ping(char *ping_addr);
diff --git a/net/lwip/Makefile b/net/lwip/Makefile
index 4c6df94807..8b3e843426 100644
--- a/net/lwip/Makefile
+++ b/net/lwip/Makefile
@@ -67,5 +67,6 @@ 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_PING) += apps/ping/
 obj-$(CONFIG_CMD_TFTPBOOT) += apps/tftp/
 obj-$(CONFIG_CMD_WGET) += apps/http/
diff --git a/net/lwip/apps/ping/Makefile b/net/lwip/apps/ping/Makefile
new file mode 100644
index 0000000000..dc63feb7b5
--- /dev/null
+++ b/net/lwip/apps/ping/Makefile
@@ -0,0 +1,11 @@
+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)
+
+.PHONY: $(obj)/ping.c
+$(obj)/ping.o: $(obj)/ping.c
+$(obj)/ping.c:
+       cp $(srctree)/net/lwip/lwip-external/contrib/apps/ping/ping.c 
$(obj)/ping.c
+
+obj-$(CONFIG_CMD_PING) += ping.o
+obj-$(CONFIG_CMD_PING) += lwip_ping.o
diff --git a/net/lwip/apps/ping/lwip_ping.c b/net/lwip/apps/ping/lwip_ping.c
new file mode 100644
index 0000000000..611fcaf591
--- /dev/null
+++ b/net/lwip/apps/ping/lwip_ping.c
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/*
+ * (C) Copyright 2023 Linaro Ltd. <maxim.uvarov@linaro.org>
+ */
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+#include "ping.h"
+#include "lwip_ping.h"
+
+static ip_addr_t ip_target;
+
+static int ulwip_ping_tmo(void)
+{
+
+       log_err("ping failed; host %s is not alive\n", ipaddr_ntoa(&ip_target));
+       return 1;
+}
+
+int ulwip_ping(char *ping_addr)
+{
+       int err;
+
+       err = ipaddr_aton(ping_addr, &ip_target);
+       if (!err) {
+               log_err("wrong ping addr string \"%s\" \n", ping_addr);
+               return -1;
+       }
+
+       ulwip_set_tmo(ulwip_ping_tmo);
+
+       ping_init(&ip_target);
+       ping_send_now();
+
+       return 0;
+}
diff --git a/net/lwip/apps/ping/lwip_ping.h b/net/lwip/apps/ping/lwip_ping.h
new file mode 100644
index 0000000000..0374f07d9e
--- /dev/null
+++ b/net/lwip/apps/ping/lwip_ping.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+/*
+ * (C) Copyright 2023 Linaro Ltd. <maxim.uvarov@linaro.org>
+ */
+
+#ifndef LWIP_PING_H
+#define LWIP_PING_H
+
+#include <lwip/ip_addr.h>
+
+void ping_raw_init(void);
+void ping_send_now(void);
+
+#endif /* LWIP_PING_H */
diff --git a/net/lwip/apps/ping/ping.h b/net/lwip/apps/ping/ping.h
new file mode 100644
index 0000000000..006a18c658
--- /dev/null
+++ b/net/lwip/apps/ping/ping.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#include <net/ulwip.h>
+#include "lwip/ip_addr.h"
+
+#define LWIP_DEBUG 1 /* ping_time is under ifdef*/
+#define PING_RESULT(cond) { \
+       if (cond == 1) { \
+               printf("host %s a alive\n", ipaddr_ntoa(addr)); \
+               printf(" %"U32_F" ms\n", (sys_now() - ping_time)); \
+               ulwip_exit(0); \
+       } else { \
+               printf("ping failed; host %s in not alive\n",\
+                      ipaddr_ntoa(addr)); \
+               ulwip_exit(-1); \
+       } \
+     } while (0);
+
+void ping_init(const ip_addr_t *ping_addr);
-- 
2.30.2