Changeset 468

Timestamp:

Jun 26, 2021, 10:00:27 PM (3 years ago)

Author:

coas-nagasima

Message:

Ethernet版でもビルドが通るよう変更。

Location:

azure_iot_hub_f767zi/trunk

Files:

• app_iothub_client/src/esp_at_socket.c (modified) (1 diff)
• azure_iot_sdk/Makefile (modified) (2 diffs)
• azure_iot_sdk/c-utility/adapters/platform_toppers.c (modified) (1 diff)
• azure_iot_sdk/c-utility/adapters/socketio_lwip.c (modified) (7 diffs)
• azure_iot_sdk/c-utility/pal/toppers/socket_async_os.h (modified) (1 diff)
• wolfssl-4.7.0/user_settings.h (modified) (1 diff)

azure_iot_hub_f767zi/trunk/app_iothub_client/src/esp_at_socket.c

@@ -1593 +1593 @@
 
         ER ret;
-        char temp[64];
+        char temp[128];
         sprintf(temp, "AT+CIPSTART=%d,\"%s\",\"%s\",%d\r\n", connection->link_id, connection->ssl, host, port);
         ret = esp_serial_write(connection->esp_state, temp, &res_kind, 10000);

azure_iot_hub_f767zi/trunk/azure_iot_sdk/Makefile

@@ -51 +51 @@
 OBJECTS += c-utility/adapters/lock_toppers.o
 OBJECTS += c-utility/adapters/platform_toppers.o
+OBJECTS += c-utility/adapters/socketio_lwip.o
 OBJECTS += c-utility/adapters/socketio_esp_at.o
 OBJECTS += c-utility/adapters/threadapi_toppers.o
@@ -65 +66 @@
 OBJECTS += c-utility/src/constmap.o
 OBJECTS += c-utility/src/crt_abstractions.o
-#OBJECTS += c-utility/src/dns_resolver_sync.o
+OBJECTS += c-utility/src/dns_resolver_sync.o
 OBJECTS += c-utility/src/doublylinkedlist.o
 OBJECTS += c-utility/src/gb_rand.o

azure_iot_hub_f767zi/trunk/azure_iot_sdk/c-utility/adapters/platform_toppers.c

@@ -50 +50 @@
 }
 
+int use_wifi = 0;
+
 const IO_INTERFACE_DESCRIPTION* platform_get_default_tlsio(void)
 {
-        return tlsio_esp_at_get_interface_description();
-        //return tlsio_wolfssl_get_interface_description();
+        if (use_wifi) {
+                return tlsio_esp_at_get_interface_description();
+        }
+        else {
+                return tlsio_wolfssl_get_interface_description();
+        }
 }
 

azure_iot_hub_f767zi/trunk/azure_iot_sdk/c-utility/adapters/socketio_lwip.c

@@ -14 +14 @@
 #undef _BSD_SOURCE
 #undef SOCKETIO_BERKELEY_UNDEF_BSD_SOURCE
+#endif
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
 #endif
 
@@ -33 +37 @@
 #include <netdb.h>
 #include <unistd.h>
+//#include <fcntl.h>
 #include <errno.h>
 #include "azure_c_shared_utility/singlylinkedlist.h"
@@ -93 +98 @@
     IO_STATE io_state;
     SINGLYLINKEDLIST_HANDLE pending_io_list;
-    unsigned char recv_bytes[RECEIVE_BYTES_VALUE];
+    unsigned char recv_bytes[XIO_RECEIVE_BUFFER_SIZE];
     DNSRESOLVER_HANDLE dns_resolver;
 } SOCKET_IO_INSTANCE;
@@ -932 +937 @@
                 signal(SIGPIPE, SIG_IGN);
 
-                ssize_t send_result = send(socket_io_instance->socket, buffer, size, 0);
+                ssize_t send_result = send(socket_io_instance->socket, buffer, size, MSG_NOSIGNAL);
                 if ((size_t)send_result != size)
                 {
@@ -946 +951 @@
                         size_t bytes_sent = (send_result < 0 ? 0 : send_result);
 
-                        if (add_pending_io(socket_io_instance, buffer + bytes_sent, size - bytes_sent, on_send_complete, callback_context) != 0)
+                        if (add_pending_io(socket_io_instance, (const unsigned char*)buffer + bytes_sent, size - bytes_sent, on_send_complete, callback_context) != 0)
                         {
                             LogError("Failure: add_pending_io failed.");
@@ -993 +998 @@
                 }
 
-                ssize_t send_result = send(socket_io_instance->socket, pending_socket_io->bytes, pending_socket_io->size, 0);
+                ssize_t send_result = send(socket_io_instance->socket, pending_socket_io->bytes, pending_socket_io->size, MSG_NOSIGNAL);
                 if ((send_result < 0) || ((size_t)send_result != pending_socket_io->size))
                 {
@@ -1045 +1050 @@
                 do
                 {
-                    received = recv(socket_io_instance->socket, socket_io_instance->recv_bytes, RECEIVE_BYTES_VALUE, 0);
+                    received = recv(socket_io_instance->socket, socket_io_instance->recv_bytes, XIO_RECEIVE_BUFFER_SIZE, MSG_NOSIGNAL);
                     if (received > 0)
                     {

azure_iot_hub_f767zi/trunk/azure_iot_sdk/c-utility/pal/toppers/socket_async_os.h

@@ -7 +7 @@
 // For Linux systems
 #include <sys/types.h>
-//#include <lwip/sockets.h>
+#include <lwip/sockets.h>
 #include <sys/select.h>
 #include <sys/errno.h>
 #include <unistd.h>
-//#include <netdb.h>
+#include <netdb.h>
 

azure_iot_hub_f767zi/trunk/wolfssl-4.7.0/user_settings.h

@@ -49 +49 @@
 #define XBADFILE   NULL
 #define XFGETS     fgets
+#define XFPRINTF   fprintf
 
 struct WOLFSSL;