Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get the openssl https server example to work with new esp-idf toolchain #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

Get the openssl https server example to work with new esp-idf toolchain #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions esp32/app/ESP32_ssl_webserver/main/openssl_server.c
View file
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ static void openssl_demo_thread(void *p)
SSL_CTX *ctx;
SSL *ssl;

int socket, new_socket;
int sock, new_socket;
socklen_t addr_len;
struct sockaddr_in sock_addr;

@@ -253,8 +253,8 @@ static void openssl_demo_thread(void *p)
ESP_LOGI(TAG, "OK");

ESP_LOGI(TAG, "SSL server create socket ......");
socket = socket(AF_INET, SOCK_STREAM, 0);
if (socket < 0) {
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) {
ESP_LOGI(TAG, "failed");
goto failed2;
}
@@ -265,15 +265,15 @@ static void openssl_demo_thread(void *p)
sock_addr.sin_family = AF_INET;
sock_addr.sin_addr.s_addr = 0;
sock_addr.sin_port = htons(OPENSSL_DEMO_LOCAL_TCP_PORT);
ret = bind(socket, (struct sockaddr*)&sock_addr, sizeof(sock_addr));
ret = bind(sock, (struct sockaddr*)&sock_addr, sizeof(sock_addr));
if (ret) {
ESP_LOGI(TAG, "failed");
goto failed3;
}
ESP_LOGI(TAG, "OK");

ESP_LOGI(TAG, "SSL server socket listen ......");
ret = listen(socket, 32);
ret = listen(sock, 32);
if (ret) {
ESP_LOGI(TAG, "failed");
goto failed3;
@@ -290,7 +290,7 @@ static void openssl_demo_thread(void *p)
ESP_LOGI(TAG, "OK");

ESP_LOGI(TAG, "SSL server socket accept client ......");
new_socket = accept(socket, (struct sockaddr *)&sock_addr, &addr_len);
new_socket = accept(sock, (struct sockaddr *)&sock_addr, &addr_len);
if (new_socket < 0) {
ESP_LOGI(TAG, "failed" );
goto failed4;
@@ -376,8 +376,8 @@ static void openssl_demo_thread(void *p)
ssl = NULL;
goto reconnect;
failed3:
close(socket);
socket = -1;
close(sock);
sock = -1;
failed2:
SSL_CTX_free(ctx);
ctx = NULL;