Changeset 393

Timestamp:

May 24, 2019, 11:03:14 AM (5 years ago)

Author:

coas-nagasima

Message:

WolfSLLのハンドシェイクで受信がないときタイムアウトするよう変更

Location:

azure_iot_hub/trunk

Files:

• app_iothub_client/src/client.c (modified) (2 diffs)
• azure_iothub/c-utility/adapters/tlsio_wolfssl.c (modified) (3 diffs)

azure_iot_hub/trunk/app_iothub_client/src/client.c

@@ -190 +190 @@
                                 printf("failure to set option \"CURL Verbose\"\r\n");
                         }
-#endif
+
                         unsigned int timeout = 241000;
                         // Because it can poll "after 9 seconds" polls will happen effectively // at ~10 seconds.
@@ -206 +206 @@
                                 printf("failure to set option \"MinimumPollingTime\"\r\n");
                         }
-
+#endif
 #ifdef SET_TRUSTED_CERT_IN_SAMPLES
                         // For mbed add the certificate information

azure_iot_hub/trunk/azure_iothub/c-utility/adapters/tlsio_wolfssl.c

@@ -52 +52 @@
     char* x509privatekey;
     int wolfssl_device_id;
+    size_t socket_reads;
 } TLS_IO_INSTANCE;
 
 STATIC_VAR_UNUSED const char* const OPTION_WOLFSSL_SET_DEVICE_ID = "SetDeviceId";
-static const size_t SOCKET_READ_LIMIT = 5;
+static const size_t SOCKET_READ_LIMIT = 30000; // 30,000 ms ?
 
 /*this function will clone an option given by name and value*/
@@ -256 +257 @@
         int res;
         tls_io_instance->tlsio_state = TLSIO_STATE_IN_HANDSHAKE;
+        tls_io_instance->socket_reads = 0;
 
         res = wolfSSL_connect(tls_io_instance->ssl);
@@ -352 +354 @@
         TLS_IO_INSTANCE* tls_io_instance = (TLS_IO_INSTANCE*)context;
         unsigned char* new_socket_io_read_bytes;
-        size_t socket_reads = 0;
 
         AZURE_UNREFERENCED_PARAMETER(ssl);
-        while (tls_io_instance->socket_io_read_byte_count == 0 && socket_reads < SOCKET_READ_LIMIT)
-        {
+        if (tls_io_instance->socket_io_read_byte_count == 0)
+        {
+            if (tls_io_instance->socket_reads >= SOCKET_READ_LIMIT) {
+                return WOLFSSL_CBIO_ERR_TIMEOUT;
+            }
             xio_dowork(tls_io_instance->socket_io);
-            if (tls_io_instance->tlsio_state != TLSIO_STATE_IN_HANDSHAKE)
-            {
-                break;
-            }
-            socket_reads++;
+            if (tls_io_instance->tlsio_state == TLSIO_STATE_IN_HANDSHAKE)
+            {
+                tls_io_instance->socket_reads++;
+            }
         }