Add AWS support to libcloudproxyneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0

Bug-AGL: SPEC-3645
Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com>
Change-Id: Ie165a50e7975a8e6f25b259be1679a9689414148

1 files changed, 15 insertions, 4 deletions

diff --git a/include/libcloudproxy.h b/include/libcloudproxy.h
index b333a14..e2501b3 100644
--- a/include/libcloudproxy.h
+++ b/include/libcloudproxy.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <map>
 #include <string>
+#include <mutex>
 #include <functional>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
@@ -29,6 +30,15 @@ extern "C"
 #include <afb/afb-ws-client.h>
 }
 
+
+struct CloudType
+{
+    static constexpr const char* Azure{"azure"};
+    static constexpr const char* Aws  {"aws"};
+
+    static bool isSupported(const char* type);
+};
+
 class CloudProxyClient
 {
 public:
@@ -41,7 +51,6 @@ public:
         Event_Max
     };
 
-
     CloudProxyClient();
     ~CloudProxyClient();
 
@@ -50,7 +59,8 @@ public:
 
     int init(const int port, const std::string& token);
 
-    int sendMessage(const std::string& data);
+    // sendMessage call is synchronous (will wait a cloudproxy reply):
+    int sendMessage(const std::string& cloud_type, const std::string& data);
 
     void set_event_handler(enum EventType et, handler_func f);
 
@@ -60,13 +70,14 @@ public:
     int unsubscribe(const std::string& event_name);
 
 private:
-    int call(const std::string& verb, struct json_object* arg);
+    int call_sync(const std::string& verb, struct json_object* arg);
 
 private:
     static const std::vector<std::string> m_api_list;
     static const std::vector<std::string> m_event_list;
 
-    std::map<EventType, handler_func> handlers;
+    std::mutex m_mutex; // used by call_sync only
+    std::map<EventType, handler_func> m_handlers;
     struct afb_wsj1_itf m_itf;
     struct afb_wsj1* m_websock{nullptr};
     sd_event* m_loop{nullptr};