From fc73538153ff2e1b775b0357b0f8df6010a70493 Mon Sep 17 00:00:00 2001
From: chenyong <1521761801@qq.com>
Date: Sat, 25 Aug 2018 21:04:11 +0800
Subject: [PATCH] [net][sal/at] Add components C++ support

---
 components/net/at/at_socket/at_socket.h             | 8 ++++++++
 components/net/at/include/at.h                      | 7 +++++++
 components/net/sal_socket/impl/af_inet.h            | 8 ++++++++
 components/net/sal_socket/include/dfs_net/dfs_net.h | 4 ++--
 components/net/sal_socket/include/sal.h             | 8 ++++++++
 components/net/sal_socket/include/sal_ipaddr.h      | 4 ++++
 components/net/sal_socket/include/sal_netdb.h       | 8 ++++++++
 components/net/sal_socket/include/sal_socket.h      | 8 ++++++++
 components/net/sal_socket/include/sal_type.h        | 8 ++++++++
 components/net/sal_socket/src/sal_socket.c          | 3 ---
 10 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/components/net/at/at_socket/at_socket.h b/components/net/at/at_socket/at_socket.h
index 8e9060908..7d9ce91f3 100644
--- a/components/net/at/at_socket/at_socket.h
+++ b/components/net/at/at_socket/at_socket.h
@@ -32,6 +32,10 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef AT_SOCKET_RECV_BFSZ
 #define AT_SOCKET_RECV_BFSZ            512
 #endif
@@ -160,4 +164,8 @@ void at_scoket_device_register(const struct at_device_ops *ops);
 
 #endif /* RT_USING_SAL */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* AT_SOCKET_H__ */
diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h
index d0040f86c..1ef0388a6 100644
--- a/components/net/at/include/at.h
+++ b/components/net/at/include/at.h
@@ -27,6 +27,9 @@
 
 #include <rtthread.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define AT_SW_VERSION                  "0.3.0"
 
 #define DBG_ENABLE
@@ -251,4 +254,8 @@ void at_port_reset(void);
 void at_port_factory_reset(void);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __AT_H__ */
diff --git a/components/net/sal_socket/impl/af_inet.h b/components/net/sal_socket/impl/af_inet.h
index 10a77d587..8d6be25ea 100644
--- a/components/net/sal_socket/impl/af_inet.h
+++ b/components/net/sal_socket/impl/af_inet.h
@@ -27,6 +27,10 @@
 
 #include <rtthread.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef SAL_USING_LWIP
 /* lwIP protocol family register */
 int lwip_inet_init(void);
@@ -37,4 +41,8 @@ int lwip_inet_init(void);
 int at_inet_init(void);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __AF_INET_H__ */
diff --git a/components/net/sal_socket/include/dfs_net/dfs_net.h b/components/net/sal_socket/include/dfs_net/dfs_net.h
index 2a21fe385..242d3c533 100644
--- a/components/net/sal_socket/include/dfs_net/dfs_net.h
+++ b/components/net/sal_socket/include/dfs_net/dfs_net.h
@@ -26,12 +26,12 @@
 #ifndef DFS_NET_H__
 #define DFS_NET_H__
 
+#include <dfs_file.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <dfs_file.h>
-
 const struct dfs_file_ops* dfs_net_get_fops(void);
 int dfs_net_getsocket(int fd);
 
diff --git a/components/net/sal_socket/include/sal.h b/components/net/sal_socket/include/sal.h
index e1a6dbedb..62ffaa303 100644
--- a/components/net/sal_socket/include/sal.h
+++ b/components/net/sal_socket/include/sal.h
@@ -28,6 +28,10 @@
 #include <dfs_file.h>
 #include <rtdevice.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
 typedef uint32_t socklen_t;
 #endif
@@ -103,4 +107,8 @@ int sal_proto_family_register(const struct proto_family *pf);
 int sal_proto_family_unregister(const struct proto_family *pf);
 struct proto_family *sal_proto_family_find(const char *name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SAL_H__ */
diff --git a/components/net/sal_socket/include/sal_ipaddr.h b/components/net/sal_socket/include/sal_ipaddr.h
index 814d1d16e..c40fc1837 100644
--- a/components/net/sal_socket/include/sal_ipaddr.h
+++ b/components/net/sal_socket/include/sal_ipaddr.h
@@ -26,6 +26,10 @@
 
 #include "sal_type.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** IPv4 only: set the IP address given as an u32_t */
 #define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32))
 /** IPv4 only: get the IP address as an u32_t */
diff --git a/components/net/sal_socket/include/sal_netdb.h b/components/net/sal_socket/include/sal_netdb.h
index 12f7abe6b..0a31f26fa 100644
--- a/components/net/sal_socket/include/sal_netdb.h
+++ b/components/net/sal_socket/include/sal_netdb.h
@@ -26,6 +26,10 @@
 
 #include <sal_socket.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define EAI_NONAME      200
 #define EAI_SERVICE     201
 #define EAI_FAIL        202
@@ -88,4 +92,8 @@ int sal_getaddrinfo(const char *nodename,
        const struct addrinfo *hints,
        struct addrinfo **res);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SAL_NETDB_H__ */
diff --git a/components/net/sal_socket/include/sal_socket.h b/components/net/sal_socket/include/sal_socket.h
index 872fd5ca9..477112392 100644
--- a/components/net/sal_socket/include/sal_socket.h
+++ b/components/net/sal_socket/include/sal_socket.h
@@ -27,6 +27,10 @@
 
 #include "sal_ipaddr.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
 typedef uint32_t socklen_t;
 #endif
@@ -175,4 +179,8 @@ int sal_socket(int domain, int type, int protocol);
 int sal_closesocket(int socket);
 int sal_ioctlsocket(int socket, long cmd, void *arg);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SAL_SOCKET_H__ */
diff --git a/components/net/sal_socket/include/sal_type.h b/components/net/sal_socket/include/sal_type.h
index 0446d5f4e..907b3d02b 100644
--- a/components/net/sal_socket/include/sal_type.h
+++ b/components/net/sal_socket/include/sal_type.h
@@ -28,6 +28,10 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int8_t    err_t;
 typedef uint8_t   u8_t;
 typedef int8_t    s8_t;
@@ -37,4 +41,8 @@ typedef uint32_t  u32_t;
 typedef int32_t   s32_t;
 typedef uintptr_t mem_ptr_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SAL_TYPE_H__ */
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index 920ce720c..7b6683a69 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -738,7 +738,6 @@ struct hostent *sal_gethostbyname(const char *name)
             {
                 return hst;
             }
-            continue;
         }
     }
 
@@ -759,7 +758,6 @@ int sal_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
             {
                 return res;
             }
-            continue;
         }
     }
 
@@ -796,7 +794,6 @@ int sal_getaddrinfo(const char *nodename,
             {
                 return ret;
             }
-            continue;
         }
     }
 
-- 
GitLab