[net][netdev]add network interface device components, SAL component adaptation netdev change

6 files changed, 29 insertions, 209 deletions

diff --git a/components/net/sal_socket/include/sal.h b/components/net/sal_socket/include/sal.h
index 17d44eef77..6ffaa90356 100644
--- a/components/net/sal_socket/include/sal.h
+++ b/components/net/sal_socket/include/sal.h
@@ -43,6 +43,24 @@ typedef uint32_t socklen_t;
 #define SAL_SOCKET_OFFSET              0
 #endif
 
+struct sal_socket
+{
+    uint32_t magic;                    /* SAL socket magic word */
+
+    int socket;                        /* SAL socket descriptor */
+    int domain;
+    int type;
+    int protocol;
+
+    struct netdev *netdev;             /* SAL network interface device */
+
+    void *user_data;                   /* user-specific data */
+#ifdef SAL_USING_TLS
+    void *user_data_tls;               /* user-specific TLS data */
+#endif
+};
+
+/* network interface socket opreations */
 struct sal_socket_ops
 {
     int (*socket)     (int domain, int type, int protocol);
@@ -64,7 +82,8 @@ struct sal_socket_ops
 #endif
 };
 
-struct sal_proto_ops
+/* sal network database name resolving */
+struct sal_netdb_ops
 {
     struct hostent* (*gethostbyname)  (const char *name);
     int             (*gethostbyname_r)(const char *name, struct hostent *ret, char *buf, size_t buflen, struct hostent **result, int *h_errnop);
@@ -72,42 +91,21 @@ struct sal_proto_ops
     void            (*freeaddrinfo)   (struct addrinfo *ai);
 };
 
-struct sal_socket
-{
-    uint32_t magic;                    /* SAL socket magic word */
-
-    int socket;                        /* SAL socket descriptor */
-    int domain;
-    int type;
-    int protocol;
-
-    const struct sal_socket_ops *ops;  /* socket options */
-
-    void *user_data;                   /* user-specific data */
-#ifdef SAL_USING_TLS
-    void *user_data_tls;               /* user-specific TLS data */
-#endif
-};
-
 struct sal_proto_family
 {
-    int family;                        /* primary protocol families type */
-    int sec_family;                    /* secondary protocol families type */
-    int (*create)(struct sal_socket *sal_socket, int type, int protocol);   /* register socket options */
-
-    struct sal_proto_ops *ops;             /* protocol family options */
+    int family;                                  /* primary protocol families type */
+    int sec_family;                              /* secondary protocol families type */
+    const struct sal_socket_ops *skt_ops;        /* socket opreations */
+    const struct sal_netdb_ops *netdb_ops;       /* network database opreations */
 };
 
 /* SAL(Socket Abstraction Layer) initialize */
 int sal_init(void);
-
+/* Get SAL socket object by socket descriptor */
 struct sal_socket *sal_get_socket(int sock);
 
-/* SAL protocol family register and unregister operate */
-int sal_proto_family_register(const struct sal_proto_family *pf);
-int sal_proto_family_unregister(int family);
-rt_bool_t sal_proto_family_is_registered(int family);
-struct sal_proto_family *sal_proto_family_find(int family);
+/* check SAL socket netweork interface device internet status */
+int sal_check_netdev_internet_up(struct netdev *netdev);
 
 #ifdef __cplusplus
 }
diff --git a/components/net/sal_socket/include/sal_ipaddr.h b/components/net/sal_socket/include/sal_ipaddr.h
deleted file mode 100644
index c0562436f0..0000000000
--- a/components/net/sal_socket/include/sal_ipaddr.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2018-05-18     ChenYong     First version
- */
-#ifndef SAL_IPADDR_H__
-#define SAL_IPADDR_H__
-
-#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 */
-#define ip4_addr_get_u32(src_ipaddr) ((src_ipaddr)->addr)
-
-#define IP4ADDR_STRLEN_MAX  16
-
-/* These macros should be calculated by the preprocessor and are used
-   with compile-time constants only (so that there is no little-endian
-   overhead at runtime). */
-#define PP_HTONS(x) ((((x) & 0x00ffUL) << 8) | (((x) & 0xff00UL) >> 8))
-#define PP_NTOHS(x) PP_HTONS(x)
-#define PP_HTONL(x) ((((x) & 0x000000ffUL) << 24) | \
-                     (((x) & 0x0000ff00UL) <<  8) | \
-                     (((x) & 0x00ff0000UL) >>  8) | \
-                     (((x) & 0xff000000UL) >> 24))
-#define PP_NTOHL(x) PP_HTONL(x)
-
-#define htons(x) (u16_t)PP_HTONS(x)
-#define ntohs(x) (u16_t)PP_NTOHS(x)
-#define htonl(x) (u32_t)PP_HTONL(x)
-#define ntohl(x) (u32_t)PP_NTOHL(x)
-
-/* If your port already typedef's in_addr_t, define IN_ADDR_T_DEFINED
-   to prevent this code from redefining it. */
-#if !defined(in_addr_t) && !defined(IN_ADDR_T_DEFINED)
-typedef u32_t in_addr_t;
-#endif
-
-struct in_addr
-{
-    in_addr_t s_addr;
-};
-
-struct in6_addr
-{
-    union
-    {
-        u32_t u32_addr[4];
-        u8_t u8_addr[16];
-    } un;
-#define s6_addr  un.u8_addr
-};
-
-enum sal_ip_addr_type
-{
-    /** IPv4 */
-    IPADDR_TYPE_V4 = 0U,
-    /** IPv6 */
-    IPADDR_TYPE_V6 = 6U,
-    /** IPv4+IPv6 ("dual-stack") */
-    IPADDR_TYPE_ANY = 46U
-};
-
-typedef struct ip4_addr
-{
-    u32_t addr;
-} ip4_addr_t;
-
-typedef struct ip6_addr
-{
-    u32_t addr[4];
-} ip6_addr_t;
-
-typedef struct _ip_addr
-{
-    union
-    {
-        ip6_addr_t ip6;
-        ip4_addr_t ip4;
-    } u_addr;
-    /** @ref sal_ip_addr_type */
-    u8_t type;
-} ip_addr_t;
-
-/** 255.255.255.255 */
-#define IPADDR_NONE         ((u32_t)0xffffffffUL)
-/** 127.0.0.1 */
-#define IPADDR_LOOPBACK     ((u32_t)0x7f000001UL)
-/** 0.0.0.0 */
-#define IPADDR_ANY          ((u32_t)0x00000000UL)
-/** 255.255.255.255 */
-#define IPADDR_BROADCAST    ((u32_t)0xffffffffUL)
-
-/** 255.255.255.255 */
-#define INADDR_NONE         IPADDR_NONE
-/** 127.0.0.1 */
-#define INADDR_LOOPBACK     IPADDR_LOOPBACK
-/** 0.0.0.0 */
-#define INADDR_ANY          IPADDR_ANY
-/** 255.255.255.255 */
-#define INADDR_BROADCAST    IPADDR_BROADCAST
-
-#define IPADDR_BROADCAST_STRING "255.255.255.255"
-
-in_addr_t sal_ipaddr_addr(const char *cp);
-int sal_ip4addr_aton(const char *cp, ip4_addr_t *addr);
-char *sal_ip4addr_ntoa(const ip4_addr_t *addr);
-char *sal_ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen);
-
-#define inet_addr(cp) sal_ipaddr_addr(cp)
-#define inet_aton(cp,addr) sal_ip4addr_aton(cp,(ip4_addr_t*)addr)
-#define inet_ntoa(addr) sal_ip4addr_ntoa((const ip4_addr_t*)&(addr))
-#define inet_ntoa_r(addr, buf, buflen)  sal_ip4addr_ntoa_r((const ip4_addr_t*)&(addr), buf, buflen)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SAL_IPADDR_H__ */
diff --git a/components/net/sal_socket/include/sal_netdb.h b/components/net/sal_socket/include/sal_netdb.h
index 3f70832083..d5ce9b1d7e 100644
--- a/components/net/sal_socket/include/sal_netdb.h
+++ b/components/net/sal_socket/include/sal_netdb.h
@@ -10,7 +10,7 @@
 #ifndef SAL_NETDB_H__
 #define SAL_NETDB_H__
 
-#include <sal_socket.h>
+#include "sal_socket.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/net/sal_socket/include/sal_socket.h b/components/net/sal_socket/include/sal_socket.h
index 0a8597df6e..066258eac9 100644
--- a/components/net/sal_socket/include/sal_socket.h
+++ b/components/net/sal_socket/include/sal_socket.h
@@ -11,7 +11,7 @@
 #ifndef SAL_SOCKET_H__
 #define SAL_SOCKET_H__
 
-#include "sal_ipaddr.h"
+#include <arpa/inet.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/net/sal_socket/include/sal_type.h b/components/net/sal_socket/include/sal_type.h
deleted file mode 100644
index 6e107ae126..0000000000
--- a/components/net/sal_socket/include/sal_type.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2018-05-17     ChenYong     First version
- */
-
-#ifndef SAL_TYPE_H__
-#define SAL_TYPE_H__
-
-#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;
-typedef uint16_t  u16_t;
-typedef int16_t   s16_t;
-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/include/socket/arpa/inet.h b/components/net/sal_socket/include/socket/arpa/inet.h
deleted file mode 100644
index f477df5c23..0000000000
--- a/components/net/sal_socket/include/socket/arpa/inet.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2015-02-17     Bernard      First version
- */
-
-#ifndef INET_H__
-#define INET_H__
-
-#include <sal_ipaddr.h>
-
-#endif