Overloading begin function in such way that it also accepts IPAddress objects

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -76,18 +76,25 @@ ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP() {
 }
 
 int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, String brokerAddress, uint16_t brokerPort) {
-  _connection = &connection;
   _brokerAddress = brokerAddress;
-  _brokerPort = brokerPort;
-  time_service.begin(&connection);
-  return begin(_brokerAddress, _brokerPort);
+  _brokerIp = INADDR_NONE;
+  return begin(connection, brokerPort);
+}
+
+int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, IPAddress const brokerIp, uint16_t const brokerPort)
+{
+  _brokerAddress = "";
+  _brokerIp = brokerIp;
+  return begin(connection, brokerPort);
 }
 
-int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
+int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, uint16_t brokerPort) {
 
-  _brokerAddress = brokerAddress;
+  _connection = &connection;
   _brokerPort = brokerPort;
 
+  time_service.begin(_connection);
+
   #ifdef BOARD_HAS_ECCX08
   byte deviceIdBytes[72];
   if (!ECCX08.begin()) {
@@ -169,11 +176,14 @@ void ArduinoIoTCloudTCP::mqttClientBegin() {
 }
 
 
-int ArduinoIoTCloudTCP::connect() {
-
-  if (!_mqttClient->connect(_brokerAddress.c_str(), _brokerPort)) {
-    return CONNECT_FAILURE;
+int ArduinoIoTCloudTCP::connect()
+{
+  if (_brokerIp == INADDR_NONE) {
+    if (!_mqttClient->connect(_brokerAddress.c_str(), _brokerPort)) return CONNECT_FAILURE;
+  } else {
+    if (!_mqttClient->connect(_brokerIp, _brokerPort))              return CONNECT_FAILURE;
   }
+
   if (_mqttClient->subscribe(_stdinTopic) == 0) {
     return CONNECT_FAILURE_SUBSCRIBE;
   }
@@ -424,7 +434,12 @@ void ArduinoIoTCloudTCP::printDebugInfo() {
   Debug.print(DBG_INFO, "***** Arduino IoT Cloud - configuration info *****");
   Debug.print(DBG_INFO, "Device ID: %s", getDeviceId().c_str());
   Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
-  Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
+
+  if (_brokerIp == INADDR_NONE) {
+    Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
+  } else {
+    Debug.print(DBG_INFO, "MQTT Broker: %d.%d.%d.%d:%d", _brokerIp[0], _brokerIp[1], _brokerIp[2], _brokerIp[3], _brokerPort);
+  }
 }
 
 ArduinoIoTCloudTCP ArduinoCloud;

src/ArduinoIoTCloudTCP.h

@@ -36,6 +36,9 @@ static uint16_t const DEFAULT_BROKER_PORT_SECURE_AUTH = 8883;
 static char const DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH[] = "mqtts-up.iot.arduino.cc";
 static uint16_t const DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884;
 
+static IPAddress const DEFAULT_BROKER_SECURE_AUTH_IP_1(34,206,248,111);
+static IPAddress const DEFAULT_BROKER_SECURE_AUTH_IP_2(3,209,5,114);
+
 class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
   public:
     ArduinoIoTCloudTCP();
@@ -50,7 +53,8 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     #else
     int begin(ConnectionHandler & connection, String brokerAddress = DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_USER_PASS_AUTH);
     #endif
-    int begin(String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
+    int begin(ConnectionHandler & connection, IPAddress const brokerIp, uint16_t const brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
+    int begin(ConnectionHandler & connection, uint16_t brokerPort);
     // Class constant declaration
     static const int MQTT_TRANSMIT_BUFFER_SIZE = 256;
 
@@ -93,6 +97,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
   private:
     ConnectionHandler * _connection;
     String _brokerAddress;
+    IPAddress _brokerIp;
     uint16_t _brokerPort;
     uint8_t _mqtt_data_buf[MQTT_TRANSMIT_BUFFER_SIZE];
     int _mqtt_data_len;