Updates to support mqtt api and global bootstrap.

Author: JonathanHenson

CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.1)
 project(aws-crt-cpp CXX)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
@@ -75,30 +74,30 @@ target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-common REQUIRED)
-find_package(aws-c-io REQUIRED)
-
-if (UNIX AND NOT APPLE)
-    find_package(s2n REQUIRED)
-endif()
-
 find_package(aws-c-mqtt REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-common aws-c-io aws-c-mqtt ${PLATFORM_LIBS})
+target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-mqtt)
 
 install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt")
 install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io")
 install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt")
 
-
 install(
-        TARGETS ${CMAKE_PROJECT_NAME} EXPORT ${CMAKE_PROJECT_NAME}-config
+        TARGETS ${CMAKE_PROJECT_NAME}
+        EXPORT ${CMAKE_PROJECT_NAME}-targets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
         LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-        COMPONENT library
 )
 
-export(TARGETS ${CMAKE_PROJECT_NAME} FILE ${CMAKE_PROJECT_NAME}-config.cmake)
-install(EXPORT ${CMAKE_PROJECT_NAME}-config DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/cmake/")
+install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/cmake/"
+        NAMESPACE AWS::)
+
+configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+        @ONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/cmake/")
 
 enable_testing()
 add_subdirectory(tests)

cmake/aws-crt-cpp-config.cmake

@@ -0,0 +1,5 @@
+include(CMakeFindDependencyMacro)
+
+find_dependency(aws-c-mqtt)
+
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])

include/aws/crt/Api.h

@@ -14,9 +14,7 @@
 * permissions and limitations under the License.
 */
 #include <aws/crt/Types.h>
-#include <aws/crt/io/EventLoopGroup.h>
-#include <aws/crt/io/TLSOptions.h>
-#include <aws/crt/mqtt/MqttClient.h>
+#include <aws/crt/Exports.h>
 
 #include <aws/io/socket.h>
 

include/aws/crt/io/Bootstrap.h

@@ -0,0 +1,53 @@
+#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/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
+    {
+        namespace Io
+        {
+            class AWS_CRT_CPP_API ClientBootstrap final
+            {
+            public:
+                ClientBootstrap(const EventLoopGroup& elGroup = EventLoopGroup(),
+                        Allocator* allocator = DefaultAllocator()) noexcept;
+                ~ClientBootstrap();
+                ClientBootstrap(const ClientBootstrap&) = delete;
+                ClientBootstrap& operator=(const ClientBootstrap&) = delete;
+                ClientBootstrap(ClientBootstrap&&) noexcept;
+                ClientBootstrap& operator=(ClientBootstrap&&) noexcept;
+
+                operator bool() noexcept;
+                int LastError() noexcept;
+
+                const aws_client_bootstrap* GetUnderlyingHandle() const;
+            private:
+                aws_client_bootstrap m_bootstrap;
+                int m_lastError;
+            };
+        }
+    }
+}

include/aws/crt/io/EventLoopGroup.h

@@ -13,8 +13,9 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-#include <aws/io/event_loop.h>
+#include <aws/crt/Api.h>
 
+#include <aws/io/event_loop.h>
 #include <aws/crt/Exports.h>
 
 namespace Aws
@@ -38,9 +39,8 @@ namespace Aws
             class AWS_CRT_CPP_API EventLoopGroup final
             {
             public:
-                EventLoopGroup() noexcept;
-                EventLoopGroup(uint16_t threadCount) noexcept;
-                EventLoopGroup(aws_allocator* allocator, uint16_t threadCount) noexcept;
+                EventLoopGroup(Allocator* allocator = DefaultAllocator()) noexcept;
+                EventLoopGroup(uint16_t threadCount, Allocator* allocator = DefaultAllocator()) noexcept;
                 ~EventLoopGroup();
                 EventLoopGroup(const EventLoopGroup&) = delete;
                 EventLoopGroup(EventLoopGroup&&) noexcept;
@@ -50,7 +50,7 @@ namespace Aws
                 operator bool() const;
                 int LastError() const;
 
-                const aws_event_loop_group *GetUnderlyingHandle() const;
+                const aws_event_loop_group* GetUnderlyingHandle() const;
 
             private:
                 aws_event_loop_group m_eventLoopGroup;

include/aws/crt/io/TLSOptions.h

@@ -14,6 +14,7 @@
  * permissions and limitations under the License.
  */
 
+#include <aws/crt/Api.h>
 #include <aws/crt/Exports.h>
 #include <aws/crt/Types.h>
 
@@ -28,6 +29,33 @@ namespace Aws
         namespace Io
         {
             using TLSCtxOptions = aws_tls_ctx_options;
+            using TlSConnectionOptions = aws_tls_connection_options;
+
+            enum class TLSMode
+            {
+                CLIENT,
+                SERVER,
+            };
+
+            class AWS_CRT_CPP_API TLSContext final
+            {
+            public:
+                TLSContext(TLSCtxOptions& 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(TLSCtxOptions& options) noexcept;
             AWS_CRT_CPP_API void InitClientWithMTLS(TLSCtxOptions& options, 

include/aws/crt/mqtt/MqttClient.h

@@ -17,7 +17,6 @@
 #include <aws/crt/Types.h>
 
 #include <aws/crt/io/TLSOptions.h>
-
 #include <aws/mqtt/client.h>
 
 #include <functional>
@@ -29,7 +28,7 @@ namespace Aws
     {
         namespace Io
         {
-            class EventLoopGroup;
+            class ClientBootstrap;
         }
 
         namespace Mqtt
@@ -146,7 +145,7 @@ namespace Aws
             private:
                 MqttConnection(MqttClient* client, const std::string& hostName, uint16_t port,
                                const Io::SocketOptions& socketOptions,
-                               const Io::TLSCtxOptions& tlsCtxOptions) noexcept;
+                               Io::TlSConnectionOptions&& tlsConnOptions) noexcept;
 
                 MqttClient *m_owningClient;
                 aws_mqtt_client_connection *m_underlyingConnection;
@@ -179,14 +178,10 @@ namespace Aws
 
             public:
                 /**
-                 * Initialize an MqttClient using eventLoopGroup. The default
-                 * allocator will be used.
-                 */
-                MqttClient(const Io::EventLoopGroup& eventLoopGroup) noexcept;
-                /**
-                 * Inialize an MqttClient using allocator and  eventLoopGroup.
+                 * Initialize an MqttClient using bootstrap and allocator
                  */
-                MqttClient(Allocator& allocator, const Io::EventLoopGroup& eventLoopGroup) noexcept;
+                MqttClient(const Io::ClientBootstrap& bootstrap, Allocator* allocator = DefaultAllocator()) noexcept;
+
                 ~MqttClient();
                 MqttClient(const MqttClient&) = delete;
                 MqttClient(MqttClient&&) noexcept;
@@ -201,7 +196,7 @@ namespace Aws
                  * all of its connection instances.
                  */
                 MqttConnection NewConnection(const std::string& hostName, uint16_t port,
-                        const Io::SocketOptions& socketOptions, const Io::TLSCtxOptions& tlsCtxOptions) noexcept;
+                        const Io::SocketOptions& socketOptions, Io::TlSConnectionOptions&& tlsConnOptions) noexcept;
 
             private:
                 aws_mqtt_client m_client;

samples/mqtt_pub_sub/CMakeLists.txt

@@ -1,5 +1,7 @@
 project(aws-crt-cpp-mqtt-pub-sub CXX)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
+
 file(GLOB MQTT_PUB_SUB_SRC
        "*.cpp"
 )
@@ -25,14 +27,5 @@ target_include_directories(${PUB_SUB_PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-common REQUIRED)
-find_package(aws-c-io REQUIRED)
-
-if (UNIX AND NOT APPLE)
-    find_package(s2n REQUIRED)
-endif()
-
-find_package(aws-c-mqtt REQUIRED)
-
-target_link_libraries(${PUB_SUB_PROJECT_NAME} AWS::aws-c-common aws-c-io aws-c-mqtt aws-crt-cpp ${PLATFORM_LIBS})
+target_link_libraries(${PUB_SUB_PROJECT_NAME} aws-crt-cpp)
 

samples/mqtt_pub_sub/main.cpp

@@ -13,10 +13,15 @@
  * permissions and limitations under the License.
  */
 #include <aws/crt/Api.h>
+#include <aws/crt/io/EventLoopGroup.h>
+#include <aws/crt/io/TLSOptions.h>
+#include <aws/crt/mqtt/MqttClient.h>
 
 #include <iostream>
 #include <mutex>
 #include <condition_variable>
+#include <algorithm>
+#include <aws/crt/io/Bootstrap.h>
 
 using namespace Aws::Crt;
 
@@ -101,7 +106,6 @@ int main(int argc, char* argv[])
      */
     Io::TLSCtxOptions tlsCtxOptions;
     Io::InitClientWithMTLS(tlsCtxOptions, certificatePath.c_str(), keyPath.c_str());
-
     /*
      * If we have a custom CA, set that up here.
      */
@@ -121,6 +125,15 @@ int main(int argc, char* argv[])
         port = 443;
     }
 
+    Io::TLSContext tlsCtx(tlsCtxOptions, Io::TLSMode::CLIENT);
+
+    if (!tlsCtx)
+    {
+        fprintf(stderr, "Tls Context creation failed with error %s\n",
+                ErrorDebugString(tlsCtx.LastError()));
+        exit(-1);
+    }
+
     /*
      * Default Socket options to use. IPV4 will be ignored based on what DNS
      * tells us.
@@ -133,12 +146,21 @@ int main(int argc, char* argv[])
     socketOptions.keep_alive_timeout_sec = 0;
     socketOptions.keepalive = false;
 
+    Io::ClientBootstrap bootstrap(eventLoopGroup);
+
+    if (!bootstrap)
+    {
+        fprintf(stderr, "ClientBootstrap failed with error %s\n",
+                ErrorDebugString(bootstrap.LastError()));
+        exit(-1);
+    }
+
     /*
      * Now Create a client. This can not throw.
      * An instance of a client must outlive its connections.
      * It is the users responsibility to make sure of this.
      */
-    Mqtt::MqttClient mqttClient(eventLoopGroup);
+    Mqtt::MqttClient mqttClient(bootstrap);
 
     /*
      * Since no exceptions are used, always check the bool operator
@@ -156,7 +178,7 @@ int main(int argc, char* argv[])
      * and its underlying memory is managed by the client.
      */
     Mqtt::MqttConnection connection =
-        mqttClient.NewConnection(endpoint, port, socketOptions, tlsCtxOptions);
+        mqttClient.NewConnection(endpoint, port, socketOptions, tlsCtx.NewConnectionOptions());
 
     if (!connection)
     {

source/Api.cpp

@@ -14,6 +14,8 @@
 */
 #include <aws/crt/Api.h>
 
+#include <aws/crt/io/TLSOptions.h>
+
 namespace Aws
 {
     namespace Crt