espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-21 17:16:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(examples): Modify examples according to lwip V2.0.3

Browse Source 
Change ip_addr/ip_addr_t to ip4_addr/ip4_addr_t.
This commit is contained in:
Zhang Jun Hao
2018-05-01 15:35:29 +08:00
parent 8f93ab7629
commit 49a636eaf6
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c
View File

@ -19,6 +19,8 @@
#include <sys/socket.h>
#include <netdb.h>
#include <lwip/apps/sntp.h>
#include "mbedtls/platform.h"
#include "mbedtls/net_sockets.h"
#include "mbedtls/ssl.h"

2
examples/protocols/https_wolfssl/main/https_wolfssl_example_main.c
View File

@ -125,7 +125,7 @@ static void wolfssl_client(void* pv)
memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.sin_family = AF_INET;
sock_addr.sin_port = htons(WEB_PORT);
memcpy(&sock_addr.sin_addr.s_addr, entry->h_addr_list[0], entry->h_length);
sock_addr.sin_addr.s_addr = ((struct in_addr*)(entry->h_addr))->s_addr;
printf("Connecting to %s:%d...\n", WEB_SERVER, WEB_PORT);
ret = connect(socket, (struct sockaddr*)&sock_addr, sizeof(sock_addr));

7
examples/protocols/openssl_client/main/openssl_demo.c
View File

@ -15,6 +15,7 @@
#include "c_types.h"
#include "esp_misc.h"
#include "lwip/sockets.h"
#include "lwip/api.h"
#include "ssl_client_crt.h"
#define OPENSSL_DEMO_THREAD_NAME "ssl_demo"
@ -71,7 +72,7 @@ LOCAL void openssl_demo_thread(void* p)
ret = netconn_gethostbyname(OPENSSL_DEMO_TARGET_NAME, &target_ip);
} while (ret);
printf("get target IP is "IPSTR"\n", IP2STR(&target_ip));
printf("get target IP is "IPSTR"\n", IP2STR(&(target_ip.u_addr.ip4)));
printf("create SSL context ......");
ctx = SSL_CTX_new(TLSv1_1_client_method());
@ -144,11 +145,11 @@ LOCAL void openssl_demo_thread(void* p)
printf("socket connect to remote ......");
memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.sin_family = AF_INET;
sock_addr.sin_addr.s_addr = target_ip.addr;
sock_addr.sin_addr.s_addr = target_ip.u_addr.ip4.addr;
sock_addr.sin_port = htons(OPENSSL_DEMO_TARGET_TCP_PORT);
ret = connect(socket, (struct sockaddr*)&sock_addr, sizeof(sock_addr));
if (ret) {
printf("failed\n", OPENSSL_DEMO_TARGET_NAME);
printf("failed\n");
goto failed5;
}
printf("OK\n");

13
examples/protocols/openssl_demo/main/openssl_demo.c
View File

@ -14,6 +14,7 @@
#include "freertos/task.h"
#include "c_types.h"
#include "lwip/sockets.h"
#include "lwip/api.h"
#define OPENSSL_DEMO_THREAD_NAME "ssl_demo"
#define OPENSSL_DEMO_THREAD_STACK_WORDS 2048
@ -56,10 +57,10 @@ LOCAL void openssl_demo_thread(void *p)
do {
ret = netconn_gethostbyname(OPENSSL_DEMO_TARGET_NAME, &target_ip);
} while(ret);
os_printf("get target IP is %d.%d.%d.%d\n", (unsigned char)((target_ip.addr & 0x000000ff) >> 0),
(unsigned char)((target_ip.addr & 0x0000ff00) >> 8),
(unsigned char)((target_ip.addr & 0x00ff0000) >> 16),
(unsigned char)((target_ip.addr & 0xff000000) >> 24));
os_printf("get target IP is %d.%d.%d.%d\n", (unsigned char)((target_ip.u_addr.ip4.addr & 0x000000ff) >> 0),
(unsigned char)((target_ip.u_addr.ip4.addr & 0x0000ff00) >> 8),
(unsigned char)((target_ip.u_addr.ip4.addr & 0x00ff0000) >> 16),
(unsigned char)((target_ip.u_addr.ip4.addr & 0xff000000) >> 24));
os_printf("create SSL context ......");
ctx = SSL_CTX_new(TLSv1_1_client_method());
@ -101,11 +102,11 @@ LOCAL void openssl_demo_thread(void *p)
os_printf("socket connect to remote ......");
memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.sin_family = AF_INET;
sock_addr.sin_addr.s_addr = target_ip.addr;
sock_addr.sin_addr.s_addr = target_ip.u_addr.ip4.addr;
sock_addr.sin_port = htons(OPENSSL_DEMO_TARGET_TCP_PORT);
ret = connect(socket, (struct sockaddr*)&sock_addr, sizeof(sock_addr));
if (ret) {
os_printf("failed\n", OPENSSL_DEMO_TARGET_NAME);
os_printf("failed\n");
goto failed5;
}
os_printf("OK\n");