Added non-tls connection support.

Author: JonathanHenson

include/aws/crt/mqtt/MqttClient.h

@@ -157,6 +157,8 @@ namespace Aws
                 MqttConnection(MqttClient* client, const char* hostName, uint16_t port,
                                const Io::SocketOptions& socketOptions,
                                Io::TlsConnectionOptions&& tlsConnOptions) noexcept;
+                MqttConnection(MqttClient* client, const char* hostName, uint16_t port,
+                               const Io::SocketOptions& socketOptions) noexcept;
 
                 MqttClient *m_owningClient;
                 aws_mqtt_client_connection *m_underlyingConnection;
@@ -178,6 +180,8 @@ namespace Aws
                                         const aws_byte_cursor* payload,
                                         void* user_data);
                 static void s_onOpComplete(aws_mqtt_client_connection* connection, uint16_t packetId, void* userdata);
+                static void s_connectionInit(MqttConnection* self, const char* hostName, uint16_t port,
+                    const Io::SocketOptions& socketOptions, Io::TlsConnectionOptions* tlsConnOptions);
             };
 
             /**
@@ -202,11 +206,17 @@ namespace Aws
                 int LastError() const noexcept;
 
                 /**
-                 * Create a new connection object from the client. The client must outlive
+                 * Create a new connection object using TLS from the client. The client must outlive
                  * all of its connection instances.
                  */
                 MqttConnection NewConnection(const char* hostName, uint16_t port,
                         const Io::SocketOptions& socketOptions, Io::TlsConnectionOptions&& tlsConnOptions) noexcept;
+                /**
+                * Create a new connection object over plain text from the client. The client must outlive
+                * all of its connection instances.
+                */
+                MqttConnection NewConnection(const char* hostName, uint16_t port,
+                    const Io::SocketOptions& socketOptions) noexcept;
 
             private:
                 aws_mqtt_client m_client;

source/mqtt/MqttClient.cpp

@@ -135,34 +135,50 @@ namespace Aws
                 aws_mem_release(callbackData->allocator, reinterpret_cast<void *>(callbackData));
             }
 
-            MqttConnection::MqttConnection(MqttClient* client,
-                        const char* hostName, uint16_t port,
-                        const Io::SocketOptions& socketOptions,
-                        Io::TlsConnectionOptions&& tlsConnOptions) noexcept :
-                           m_owningClient(client),
-                           m_lastError(AWS_ERROR_SUCCESS),
-                           m_connectionState(ConnectionState::Init)
+            void MqttConnection::s_connectionInit(MqttConnection* self,
+                const char* hostName, uint16_t port, const Io::SocketOptions& socketOptions, 
+                Io::TlsConnectionOptions* tlsConnOptions)
             {
                 aws_mqtt_client_connection_callbacks callbacks;
                 AWS_ZERO_STRUCT(callbacks);
-                callbacks.user_data = this;
+                callbacks.user_data = self;
                 callbacks.on_connack = s_onConnAck;
                 callbacks.on_connection_failed = s_onConnectionFailed;
                 callbacks.on_disconnect = s_onDisconnect;
 
                 ByteBuf hostNameBuf = aws_byte_buf_from_c_str(hostName);
                 ByteCursor hostNameCur = aws_byte_cursor_from_buf(&hostNameBuf);
 
-                m_underlyingConnection =
-                        aws_mqtt_client_connection_new(&m_owningClient->m_client, callbacks,
-                                &hostNameCur, port,
-                                (Io::SocketOptions*)&socketOptions, &tlsConnOptions);
+                self->m_underlyingConnection = aws_mqtt_client_connection_new(&self->m_owningClient->m_client, 
+                                                  callbacks, &hostNameCur, port,
+                                                  const_cast<Io::SocketOptions*>(&socketOptions), tlsConnOptions);
 
-                if (!m_underlyingConnection)
+                if (!self->m_underlyingConnection)
                 {
-                    m_connectionState = ConnectionState::Error;
-                    m_lastError = aws_last_error();
-                }                
+                    self->m_connectionState = ConnectionState::Error;
+                    self->m_lastError = aws_last_error();
+                }
+            }
+
+            MqttConnection::MqttConnection(MqttClient* client,
+                        const char* hostName, uint16_t port,
+                        const Io::SocketOptions& socketOptions,
+                        Io::TlsConnectionOptions&& tlsConnOptions) noexcept :
+                           m_owningClient(client),
+                           m_lastError(AWS_ERROR_SUCCESS),
+                           m_connectionState(ConnectionState::Init)
+            {
+                s_connectionInit(this, hostName, port, socketOptions, &tlsConnOptions);
+            } 
+
+            MqttConnection::MqttConnection(MqttClient* client,
+                    const char* hostName, uint16_t port,
+                    const Io::SocketOptions& socketOptions) noexcept :
+                m_owningClient(client),
+                m_lastError(AWS_ERROR_SUCCESS),
+                m_connectionState(ConnectionState::Init)
+            {
+                s_connectionInit(this, hostName, port, socketOptions, nullptr);
             }
 
             MqttConnection::~MqttConnection()
@@ -495,6 +511,13 @@ namespace Aws
             {
                 return MqttConnection(this, hostName, port, socketOptions, std::move(tlsConnOptions));
             }
+
+            MqttConnection MqttClient::NewConnection(const char* hostName, uint16_t port,
+                const Io::SocketOptions& socketOptions) noexcept
+
+            {
+                return MqttConnection(this, hostName, port, socketOptions);
+            }
         }
     }
 }