s938
/
webclient
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【适配】SAL TLS 功能改动

Browse Source 
Signed-off-by: chenyong <1521761801@qq.com>
master
chenyong 7 years ago
parent 6f74cbcd62
commit 1ac359412c
4 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File

12
README.md
Unescape Escape View File

@ -56,16 +56,16 @@ WebClient 软件包遵循 Apache-2.0 许可，详见 LICENSE 文件。
``` ```
RT-Thread online packages RT-Thread online packages
IoT - internet of things ---> IoT - internet of things --->
[*] WebClient: A HTTP/HTTPS Client for RT-Thread [*] WebClient: A HTTP/HTTPS Client for RT-Thread
[ ] Enable support tls protocol [ ] Enable webclient GET/POST samples
[ ] Enable webclient GET/POST samples Select TLS mode (Not support) --->
Version (latest) ---> Version (latest) --->
``` ```
**Enable support tls protocol** ：开启 HTTPS 支持；
**Enable webclient GET/POST samples** ：添加示例代码； **Enable webclient GET/POST samples** ：添加示例代码；
**Select TLS mode** ：配置开启 HTTPS 支持，选择支持的模式；
**Version** ：配置软件包版本。 **Version** ：配置软件包版本。
配置完成后让 RT-Thread 的包管理器自动更新，或者使用 pkgs --update 命令更新包到 BSP 中。 配置完成后让 RT-Thread 的包管理器自动更新，或者使用 pkgs --update 命令更新包到 BSP 中。

11
docs/user-guide.md
Unescape Escape View File

@ -14,15 +14,15 @@
RT-Thread online packages RT-Thread online packages
IoT - internet of things ---> IoT - internet of things --->
[*] WebClient: A HTTP/HTTPS Client for RT-Thread [*] WebClient: A HTTP/HTTPS Client for RT-Thread
[ ] Enable support tls protocol
[ ] Enable webclient GET/POST samples [ ] Enable webclient GET/POST samples
Select TLS mode (Not support) --->
Version (latest) ---> Version (latest) --->
``` ```
**Enable support tls protocol** ：开启对 HTTPS 支持；
**Enable webclient GET/POST samples** ：添加示例代码； **Enable webclient GET/POST samples** ：添加示例代码；
**Select TLS mode** ：配置开启 HTTPS 支持，选择支持的模式；
**Version** ：配置软件包版本号。 **Version** ：配置软件包版本号。
选择合适的配置项后，使用 `pkgs --update` 命令下载软件包并更新用户配置。 选择合适的配置项后，使用 `pkgs --update` 命令下载软件包并更新用户配置。
@ -57,8 +57,9 @@ struct webclient_session
int content_length; //当前接收数据长度（非 chunk 模式） int content_length; //当前接收数据长度（非 chunk 模式）
size_t content_remainder; //当前剩余接收数据长度 size_t content_remainder; //当前剩余接收数据长度
#ifdef WEBCLIENT_USING_TLS rt_bool_t is_tls; //当前连接是否是 HTTPS 连接
#ifdef WEBCLIENT_USING_MBED_TLS
MbedTLSSession *tls_session; // HTTPS 协议相关会话结构体 MbedTLSSession *tls_session; // HTTPS 协议相关会话结构体
#endif #endif
}; };

5
inc/webclient.h
Unescape Escape View File

@ -19,7 +19,7 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef WEBCLIENT_USING_TLS #if defined(WEBCLIENT_USING_MBED_TLS) || defined(WEBCLIENT_USING_SAL_TLS)
#include <tls_client.h> #include <tls_client.h>
#endif #endif
@ -96,7 +96,8 @@ struct webclient_session
int content_length; int content_length;
size_t content_remainder; /* remainder of content length */ size_t content_remainder; /* remainder of content length */
#ifdef WEBCLIENT_USING_TLS rt_bool_t is_tls; /* HTTPS connect */
#ifdef WEBCLIENT_USING_MBED_TLS
MbedTLSSession *tls_session; /* mbedtls connect session */ MbedTLSSession *tls_session; /* mbedtls connect session */
#endif #endif
}; };

64
src/webclient.c
Unescape Escape View File

@ -45,8 +45,8 @@ extern long int strtol(const char *nptr, char **endptr, int base);
static int webclient_send(struct webclient_session* session, const unsigned char *buffer, size_t len, int flag) static int webclient_send(struct webclient_session* session, const unsigned char *buffer, size_t len, int flag)
{ {
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if(session->tls_session) if (session->tls_session)
{ {
return mbedtls_client_write(session->tls_session, buffer, len); return mbedtls_client_write(session->tls_session, buffer, len);
} }
@ -57,8 +57,8 @@ static int webclient_send(struct webclient_session* session, const unsigned char
static int webclient_recv(struct webclient_session* session, unsigned char *buffer, size_t len, int flag) static int webclient_recv(struct webclient_session* session, unsigned char *buffer, size_t len, int flag)
{ {
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if(session->tls_session) if (session->tls_session)
{ {
return mbedtls_client_read(session->tls_session, buffer, len); return mbedtls_client_read(session->tls_session, buffer, len);
} }
@ -79,9 +79,11 @@ static int webclient_read_line(struct webclient_session *session, char *buffer,
while (count < size) while (count < size)
{ {
rc = webclient_recv(session, (unsigned char *) &ch, 1, 0); rc = webclient_recv(session, (unsigned char *) &ch, 1, 0);
#ifdef WEBCLIENT_USING_TLS #if defined(WEBCLIENT_USING_MBED_TLS) || defined(WEBCLIENT_USING_SAL_TLS)
if(session->tls_session && rc == MBEDTLS_ERR_SSL_WANT_READ) if (session->is_tls && (rc == MBEDTLS_ERR_SSL_WANT_READ || rc == MBEDTLS_ERR_SSL_WANT_WRITE))
{
continue; continue;
}
#endif #endif
if (rc <= 0) if (rc <= 0)
return rc; return rc;
@ -224,9 +226,11 @@ static int webclient_resolve_address(struct webclient_session *session, struct a
host_addr_new[host_addr_len] = '\0'; host_addr_new[host_addr_len] = '\0';
session->host = host_addr_new; session->host = host_addr_new;
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if(session->tls_session) if (session->tls_session)
{
session->tls_session->host = web_strdup(host_addr_new); session->tls_session->host = web_strdup(host_addr_new);
}
#endif #endif
} }
@ -239,8 +243,8 @@ static int webclient_resolve_address(struct webclient_session *session, struct a
rt_memset(&hint, 0, sizeof(hint)); rt_memset(&hint, 0, sizeof(hint));
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if(session->tls_session) if (session->tls_session)
{ {
session->tls_session->port = web_strdup(port_str); session->tls_session->port = web_strdup(port_str);
ret = getaddrinfo(session->tls_session->host, port_str, &hint, res); ret = getaddrinfo(session->tls_session->host, port_str, &hint, res);
@ -282,7 +286,7 @@ __exit:
return rc; return rc;
} }
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
/** /**
* create and initialize https session. * create and initialize https session.
* *
@ -351,12 +355,15 @@ static int webclient_connect(struct webclient_session *session, const char *URI)
if (strncmp(URI, "https://", 8) == 0) if (strncmp(URI, "https://", 8) == 0)
{ {
#ifdef WEBCLIENT_USING_TLS #if defined(WEBCLIENT_USING_SAL_TLS)
session->is_tls = RT_TRUE;
#elif defined(WEBCLIENT_USING_MBED_TLS)
if(webclient_open_tls(session, URI) < 0) if(webclient_open_tls(session, URI) < 0)
{ {
LOG_E("connect failed, https client open URI(%s) failed!", URI); LOG_E("connect failed, https client open URI(%s) failed!", URI);
return -WEBCLIENT_ERROR; return -WEBCLIENT_ERROR;
} }
session->is_tls = RT_TRUE;
#else #else
LOG_E("not support https connect, please enable webclient https configure!"); LOG_E("not support https connect, please enable webclient https configure!");
rc = -WEBCLIENT_ERROR; rc = -WEBCLIENT_ERROR;
@ -390,7 +397,7 @@ static int webclient_connect(struct webclient_session *session, const char *URI)
goto __exit; goto __exit;
} }
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if (session->tls_session) if (session->tls_session)
{ {
int tls_ret = 0; int tls_ret = 0;
@ -424,7 +431,19 @@ static int webclient_connect(struct webclient_session *session, const char *URI)
#endif #endif
{ {
#ifdef WEBCLIENT_USING_SAL_TLS
if (session->is_tls)
{
socket_handle = socket(res->ai_family, SOCK_STREAM, PROTOCOL_TLS_MBED);
}
else
{
socket_handle = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
}
#else
socket_handle = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP); socket_handle = socket(res->ai_family, SOCK_STREAM, IPPROTO_TCP);
#endif
if (socket_handle < 0) if (socket_handle < 0)
{ {
LOG_E("connect failed, create socket(%d) error.", socket_handle); LOG_E("connect failed, create socket(%d) error.", socket_handle);
@ -1181,9 +1200,13 @@ int webclient_read(struct webclient_session *session, unsigned char *buffer, siz
bytes_read = webclient_recv(session, buffer + total_read, left, 0); bytes_read = webclient_recv(session, buffer + total_read, left, 0);
if (bytes_read <= 0) if (bytes_read <= 0)
{ {
#ifdef WEBCLIENT_USING_TLS #if defined(WEBCLIENT_USING_SAL_TLS) || defined(WEBCLIENT_USING_MBED_TLS)
if(session->tls_session && bytes_read == MBEDTLS_ERR_SSL_WANT_READ) if(session->is_tls &&
(bytes_read == MBEDTLS_ERR_SSL_WANT_READ || bytes_read == MBEDTLS_ERR_SSL_WANT_WRITE))
{
continue; continue;
}
#endif #endif
LOG_E("receive data error(%d).", bytes_read); LOG_E("receive data error(%d).", bytes_read);
@ -1256,9 +1279,12 @@ int webclient_write(struct webclient_session *session, const unsigned char *buff
bytes_write = webclient_send(session, buffer + total_write, left, 0); bytes_write = webclient_send(session, buffer + total_write, left, 0);
if (bytes_write <= 0) if (bytes_write <= 0)
{ {
#ifdef WEBCLIENT_USING_TLS #if defined(WEBCLIENT_USING_SAL_TLS) || defined(WEBCLIENT_USING_MBED_TLS)
if(session->tls_session && bytes_write == MBEDTLS_ERR_SSL_WANT_WRITE) if(session->is_tls &&
(bytes_write == MBEDTLS_ERR_SSL_WANT_READ || bytes_write == MBEDTLS_ERR_SSL_WANT_WRITE))
{
continue; continue;
}
#endif #endif
if (errno == EWOULDBLOCK || errno == EAGAIN) if (errno == EWOULDBLOCK || errno == EAGAIN)
{ {
@ -1303,7 +1329,7 @@ int webclient_close(struct webclient_session *session)
{ {
RT_ASSERT(session); RT_ASSERT(session);
#ifdef WEBCLIENT_USING_TLS #ifdef WEBCLIENT_USING_MBED_TLS
if (session->tls_session) if (session->tls_session)
{ {
mbedtls_client_close(session->tls_session); mbedtls_client_close(session->tls_session);

Write Preview
Loading…
Cancel
Save