Changeset 396

Timestamp:

May 28, 2019, 3:22:09 PM (5 years ago)

Author:

coas-nagasima

Message:

動かないがMQTTを追加

Location:

azure_iot_hub/trunk

Files:

• app_iothub_client/src/client.c (modified) (5 diffs)
• app_iothub_client/src/main.c (modified) (1 diff)
• azure_iothub/iothub_client/inc/iothubtransportmqtt.h (added)
• azure_iothub/iothub_client/src/iothub_client_ll_uploadtoblob.c (modified) (1 diff)
• azure_iothub/iothub_client/src/iothubtransportmqtt.c (added)

azure_iot_hub/trunk/app_iothub_client/src/client.c

@@ -17 +17 @@
 #include "iothub_message.h"
 #include "iothubtransporthttp.h"
+#include "iothubtransportmqtt.h"
 #include "iothubtransportmqtt_websockets.h"
 
@@ -131 +132 @@
         EVENT_INSTANCE* eventInstance = (EVENT_INSTANCE*)userContextCallback;
 
-        (void)printf("Confirmation[%d] received for message tracking id = %zu with result = %s\r\n", callbackCounter, eventInstance->messageTrackingId, MU_ENUM_TO_STRING(IOTHUB_CLIENT_CONFIRMATION_RESULT, result));
+        (void)printf("Confirmation[%d] received for message tracking id = %u with result = %s\r\n", callbackCounter, eventInstance->messageTrackingId, MU_ENUM_TO_STRING(IOTHUB_CLIENT_CONFIRMATION_RESULT, result));
 
         /* Some device specific action code goes here... */
@@ -138 +139 @@
 }
 
-void iothub_client_run(void)
+void iothub_client_run(int proto)
 {
         IOTHUB_CLIENT_LL_HANDLE iotHubClientHandle;
@@ -160 +161 @@
         else
         {
-#if 1
-                (void)printf("Starting the IoTHub client sample HTTP...\r\n");
-                IOTHUB_CLIENT_TRANSPORT_PROVIDER protocol = HTTP_Protocol;
-#else
-                (void)printf("Starting the IoTHub client sample MQTT...\r\n");
-                IOTHUB_CLIENT_TRANSPORT_PROVIDER protocol = MQTT_WebSocket_Protocol;
-#endif
+                IOTHUB_CLIENT_TRANSPORT_PROVIDER protocol;
+                switch (proto) {
+                case 0:
+                        (void)printf("Starting the IoTHub client sample HTTP...\r\n");
+                        protocol = HTTP_Protocol;
+                        break;
+                case 1:
+                        (void)printf("Starting the IoTHub client sample MQTT...\r\n");
+                        protocol = MQTT_Protocol;
+                        break;
+                case 2:
+                        (void)printf("Starting the IoTHub client sample MQTT over WebSocket...\r\n");
+                        protocol = MQTT_WebSocket_Protocol;
+                        break;
+                default:
+                        platform_deinit();
+                        return;
+                }
 
                 if ((iotHubClientHandle = IoTHubClient_LL_CreateFromConnectionString(connectionString, protocol)) == NULL)
@@ -294 +306 @@
 int iothub_client_main(int argc, char **argv)
 {
-        iothub_client_run();
+        iothub_client_run(0);
         return 0;
 }

azure_iot_hub/trunk/app_iothub_client/src/main.c

@@ -171 +171 @@
 static void main_initialize()
 {
-        FILINFO fno;
-#if FF_USE_LFN
-        char lfn[FF_MAX_LFN + 1];
-        fno.lfname = lfn;
-        fno.lfsize = FF_MAX_LFN + 1;
-#endif
         ER ret;
 

azure_iot_hub/trunk/azure_iothub/iothub_client/src/iothub_client_ll_uploadtoblob.c

@@ -832 +832 @@
                                             {
                                                 req_string = STRING_construct_sprintf("{\"isSuccess\":%s, \"statusCode\":%d, \"statusDescription\":""}", ((httpResponse < 300) ? "true" : "false"), httpResponse);
-                                                }
+                                            }
                                             else
                                             {