Addressed PR feedback, still a bit more to go.

Author: JonathanHenson

CMakeLists.txt

@@ -55,6 +55,12 @@ if (WIN32)
 endif()
 
 add_library(${CMAKE_PROJECT_NAME} ${AWS_CRT_CPP_SRC})
+
+if (BUILD_SHARED_LIBS AND WIN32)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC -DUSE_IMPORT_EXPORT)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -DAWS_CRT_CPP_EXPORTS)
+endif()
+
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 
 set(CMAKE_C_FLAGS_DEBUGOPT "")
@@ -102,4 +108,3 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
 enable_testing()
 add_subdirectory(tests)
 add_subdirectory(samples/mqtt_pub_sub)
-

include/aws/crt/Api.h

@@ -14,9 +14,10 @@
 * permissions and limitations under the License.
 */
 #include <aws/crt/Types.h>
-#include <aws/crt/Exports.h>
-
-#include <aws/io/socket.h>
+#include <aws/crt/io/Bootstrap.h>
+#include <aws/crt/io/EventLoopGroup.h>
+#include <aws/crt/io/TlsOptions.h>
+#include <aws/crt/mqtt/MqttClient.h>
 
 namespace Aws
 {
@@ -34,12 +35,7 @@ namespace Aws
             ApiHandle& operator =(ApiHandle&&) = delete;
         };
 
-        AWS_CRT_CPP_API Allocator* DefaultAllocator() noexcept;
         AWS_CRT_CPP_API void LoadErrorStrings() noexcept;
         AWS_CRT_CPP_API const char* ErrorDebugString(int error) noexcept;
-
-        AWS_CRT_CPP_API ByteBuf ByteBufFromCString(const char* str) noexcept;
-        AWS_CRT_CPP_API ByteBuf ByteBufFromArray(const uint8_t *array, size_t len) noexcept;
-
     }
-}
+}

include/aws/crt/Types.h

@@ -13,7 +13,11 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+#include <aws/crt/Exports.h>
+
+#include <aws/common/common.h>
 #include <aws/mqtt/mqtt.h>
+#include <aws/io/socket.h>
 
 struct aws_allocator;
 struct aws_byte_buf;
@@ -28,6 +32,10 @@ namespace Aws
         using ByteBuf = aws_byte_buf;
         using ByteCursor = aws_byte_cursor;
 
+        AWS_CRT_CPP_API Allocator* DefaultAllocator() noexcept;
+        AWS_CRT_CPP_API ByteBuf ByteBufFromCString(const char* str) noexcept;
+        AWS_CRT_CPP_API ByteBuf ByteBufFromArray(const uint8_t *array, size_t len) noexcept;
+
         namespace Io
         {
            using SocketOptions = aws_socket_options;
@@ -39,4 +47,4 @@ namespace Aws
             using ReturnCode = aws_mqtt_connect_return_code;
         }
     }
-}
+}

include/aws/crt/io/Bootstrap.h

@@ -14,15 +14,12 @@
  * permissions and limitations under the License.
  */
 
-#include <aws/crt/Api.h>
 #include <aws/crt/Exports.h>
 #include <aws/crt/Types.h>
 #include <aws/crt/io/EventLoopGroup.h>
 
 #include <aws/io/channel_bootstrap.h>
 
-class EventLoopGroup;
-
 namespace Aws
 {
     namespace Crt
@@ -40,8 +37,8 @@ namespace Aws
                 ClientBootstrap(ClientBootstrap&&) noexcept;
                 ClientBootstrap& operator=(ClientBootstrap&&) noexcept;
 
-                operator bool() noexcept;
-                int LastError() noexcept;
+                operator bool() const noexcept;
+                int LastError() const noexcept;
 
                 const aws_client_bootstrap* GetUnderlyingHandle() const;
             private:

include/aws/crt/io/EventLoopGroup.h

@@ -13,10 +13,9 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-#include <aws/crt/Api.h>
+#include <aws/crt/Types.h>
 
 #include <aws/io/event_loop.h>
-#include <aws/crt/Exports.h>
 
 namespace Aws
 {
@@ -44,8 +43,8 @@ namespace Aws
                 ~EventLoopGroup();
                 EventLoopGroup(const EventLoopGroup&) = delete;
                 EventLoopGroup(EventLoopGroup&&) noexcept;
-                EventLoopGroup&operator =(const EventLoopGroup&) = delete;
-                EventLoopGroup&operator =(EventLoopGroup&&) noexcept;
+                EventLoopGroup& operator =(const EventLoopGroup&) = delete;
+                EventLoopGroup& operator =(EventLoopGroup&&) noexcept;
 
                 operator bool() const;
                 int LastError() const;

include/aws/crt/io/TLSOptions.h

@@ -0,0 +1,74 @@
+#pragma once
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <aws/crt/Types.h>
+
+#include <aws/io/tls_channel_handler.h>
+
+struct aws_tls_ctx_options;
+
+namespace Aws
+{
+    namespace Crt
+    {
+        namespace Io
+        {
+            using TlsContextOptions = aws_tls_ctx_options;
+            using TlsConnectionOptions = aws_tls_connection_options;
+
+            enum class TLSMode
+            {
+                CLIENT,
+                SERVER,
+            };
+
+            class AWS_CRT_CPP_API TlsContext final
+            {
+            public:
+                TlsContext(TlsContextOptions& options, TLSMode mode, Allocator* allocator = DefaultAllocator()) noexcept;
+                ~TlsContext();
+                TlsContext(const TlsContext&) = delete;
+                TlsContext& operator=(const TlsContext&) = delete;
+                TlsContext(TlsContext&&) noexcept;
+                TlsContext& operator=(TlsContext&&) noexcept;
+
+                TlsConnectionOptions NewConnectionOptions() const noexcept;
+
+                operator bool() const noexcept;
+                int LastError() const noexcept;
+
+            private:
+                aws_tls_ctx* m_ctx;
+                int m_lastError;
+            };
+
+            AWS_CRT_CPP_API void InitDefaultClient(TlsContextOptions& options) noexcept;
+            AWS_CRT_CPP_API void InitClientWithMtls(TlsContextOptions &options,
+                                                    const char *cert_path, const char *pkey_path) noexcept;
+            AWS_CRT_CPP_API void InitClientWithMtlsPkcs12(TlsContextOptions &options,
+                                                          const char *pkcs12_path, const char *pkcs12_pwd) noexcept;
+            AWS_CRT_CPP_API void SetALPNList(TlsContextOptions& options, const char* alpn_list) noexcept;
+            AWS_CRT_CPP_API void SetVerifyPeer(TlsContextOptions& options, bool verify_peer) noexcept;
+            AWS_CRT_CPP_API void OverrideDefaultTrustStore(TlsContextOptions& options,
+                const char* caPath, const char* caFile) noexcept;
+
+            AWS_CRT_CPP_API void InitTlsStaticState(Allocator *alloc) noexcept;
+            AWS_CRT_CPP_API void CleanUpTlsStaticState() noexcept;
+
+            AWS_CRT_CPP_API bool IsAlpnSupported() noexcept;
+        }
+    }
+}

include/aws/crt/io/TlsOptions.h

@@ -16,12 +16,11 @@
 #include <aws/crt/Exports.h>
 #include <aws/crt/Types.h>
 
-#include <aws/crt/io/TLSOptions.h>
+#include <aws/crt/io/TlsOptions.h>
 #include <aws/mqtt/client.h>
 
 #include <functional>
 #include <memory>
-#include <string>
 
 namespace Aws
 {
@@ -51,13 +50,13 @@ namespace Aws
             /**
              * Invoked when a disconnect message has been sent.
              */
-            using OnDisconnectHandler = std::function<void(MqttConnection& connection)>;
+            using OnDisconnectHandler = std::function<bool(MqttConnection& connection)>;
 
             /**
              * Invoked upon receipt of a Publish message on a subscribed topic.
              */
             using OnPublishReceivedHandler = std::function<void(MqttConnection& connection, 
-                const std::string& topic, const ByteBuf& payload)>;
+                const ByteBuf& topic, const ByteBuf& payload)>;
             using OnOperationCompleteHandler = std::function<void(MqttConnection& connection, uint16_t packetId)>;
 
             /**
@@ -95,20 +94,20 @@ namespace Aws
                 /**
                  * Sets LastWill for the connection. The memory backing payload must outlive the connection.
                  */
-                void SetWill(const std::string& topic, QOS qos, bool retain,
+                void SetWill(const char* topic, QOS qos, bool retain,
                         const ByteBuf& payload) noexcept;
 
                 /**
                  * Sets login credentials for the connection. The must get set before the Connect call
                  * if it is to be used. 
                  */
-                void SetLogin(const std::string& userName, const std::string& password) noexcept;
+                void SetLogin(const char* userName, const char* password) noexcept;
 
                 /**
                  * Initiates the connection, OnConnectionFailedHandler and/or OnConnAckHandler will
                  * be invoked in an event-loop thread.
                  */
-                void Connect(const std::string& clientId, bool cleanSession, uint16_t keepAliveTime) noexcept;
+                void Connect(const char* clientId, bool cleanSession, uint16_t keepAliveTime) noexcept;
 
                 /**
                  * Initiates disconnect, OnDisconnectHandler will be invoked in an event-loop thread.
@@ -120,22 +119,22 @@ namespace Aws
                  * thread upon an incoming Publish message. OnOperationCompleteHandler will be invoked
                  * upon receipt of a suback message.
                  */
-                uint16_t Subscribe(const std::string& topicFilter, QOS qos,
+                uint16_t Subscribe(const char* topicFilter, QOS qos,
                         OnPublishReceivedHandler&& onPublish,
                         OnOperationCompleteHandler&& onOpComplete) noexcept;
 
                 /**
                  * Unsubscribes from topicFilter. OnOperationCompleteHandler will be invoked upon receipt of
                  * an unsuback message.
                  */
-                uint16_t Unsubscribe(const std::string& topicFilter,
+                uint16_t Unsubscribe(const char* topicFilter,
                         OnOperationCompleteHandler&& onOpComplete) noexcept;
 
                 /**
                  * Publishes to topic. The backing memory for payload must stay available until the 
                  * OnOperationCompleteHandler has been invoked.
                  */
-                uint16_t Publish(const std::string& topic, QOS qos, bool retain, const ByteBuf& payload,
+                uint16_t Publish(const char* topic, QOS qos, bool retain, const ByteBuf& payload,
                                  OnOperationCompleteHandler&& onOpComplete) noexcept;
 
                 /**
@@ -144,9 +143,9 @@ namespace Aws
                 void Ping();
 
             private:
-                MqttConnection(MqttClient* client, const std::string& hostName, uint16_t port,
+                MqttConnection(MqttClient* client, const char* hostName, uint16_t port,
                                const Io::SocketOptions& socketOptions,
-                               Io::TlSConnectionOptions&& tlsConnOptions) noexcept;
+                               Io::TlsConnectionOptions&& tlsConnOptions) noexcept;
 
                 MqttClient *m_owningClient;
                 aws_mqtt_client_connection *m_underlyingConnection;
@@ -162,7 +161,7 @@ namespace Aws
                     enum aws_mqtt_connect_return_code return_code,
                     bool session_present,
                     void* user_data);
-                static void s_onDisconnect(aws_mqtt_client_connection* connection, int errorCode, void* userData);
+                static bool s_onDisconnect(aws_mqtt_client_connection* connection, int errorCode, void* userData);
                 static void s_onPublish(aws_mqtt_client_connection*connection,
                                         const aws_byte_cursor* topic,
                                         const aws_byte_cursor* payload,
@@ -196,8 +195,8 @@ namespace Aws
                  * Create a new connection object from the client. The client must outlive
                  * all of its connection instances.
                  */
-                MqttConnection NewConnection(const std::string& hostName, uint16_t port,
-                        const Io::SocketOptions& socketOptions, Io::TlSConnectionOptions&& tlsConnOptions) noexcept;
+                MqttConnection NewConnection(const char* hostName, uint16_t port,
+                        const Io::SocketOptions& socketOptions, Io::TlsConnectionOptions&& tlsConnOptions) noexcept;
 
             private:
                 aws_mqtt_client m_client;