From b30e9139d5502acab8c36ae9a56d4cd640786c44 Mon Sep 17 00:00:00 2001
From: YOUR_NAME <liujiandong1@huawei.com>
Date: Sat, 30 Oct 2021 14:46:29 +0800
Subject: [PATCH] fix: switch inet_addr to a function

switch inet_addr to a function

close: #I4G4I4

Signed-off-by: liujiandong <liujiandong1@huawei.com>
---
 .../net/lwip-2.1/porting/include/lwip/inet.h  |  3 ---
 .../lwip-2.1/porting/src/sockets_porting.c    | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/components/net/lwip-2.1/porting/include/lwip/inet.h b/components/net/lwip-2.1/porting/include/lwip/inet.h
index 3a77c310..5f1dacc7 100644
--- a/components/net/lwip-2.1/porting/include/lwip/inet.h
+++ b/components/net/lwip-2.1/porting/include/lwip/inet.h
@@ -43,9 +43,6 @@
             (ip4_addr_set_u32(target_ipaddr, (source_inaddr)->s_addr))
 
 /* directly map this to the lwip internal functions */
-#define inet_addr(cp)                   ipaddr_addr(cp)
-#define inet_aton(cp, addr)             ip4addr_aton(cp, (ip4_addr_t*)addr)
-#define inet_ntoa(addr)                 ip4addr_ntoa((const ip4_addr_t*)&(addr))
 #define inet_ntoa_r(addr, buf, buflen)  ip4addr_ntoa_r((const ip4_addr_t*)&(addr), buf, buflen)
 #endif /* LWIP_IPV4 */
 #if LWIP_IPV6
diff --git a/components/net/lwip-2.1/porting/src/sockets_porting.c b/components/net/lwip-2.1/porting/src/sockets_porting.c
index 91fb1319..503b4449 100644
--- a/components/net/lwip-2.1/porting/src/sockets_porting.c
+++ b/components/net/lwip-2.1/porting/src/sockets_porting.c
@@ -161,6 +161,27 @@ int inet_pton(int af, const char *src, void *dst)
     return lwip_inet_pton(af, src, dst);
 }
 
+#ifndef LWIP_INET_ADDR_FUNC
+in_addr_t inet_addr(const char *cp)
+{
+    return ipaddr_addr(cp);
+}
+#endif
+
+#ifndef LWIP_INET_NTOA_FUNC
+char *inet_ntoa(struct in_addr addr)
+{
+    return ip4addr_ntoa((const ip4_addr_t*)&(addr));
+}
+#endif
+
+#ifndef LWIP_INET_ATON_FUNC
+int inet_aton(const char *cp, struct in_addr *addr)
+{
+    return ip4addr_aton(cp, (ip4_addr_t*)addr);
+}
+#endif
+
 int ioctlsocket(int s, long cmd, void *argp)
 {
     return lwip_ioctl(s, cmd, argp);