Merge pull request #574 from adafruit/add-port-support-and-insecure-vm-testing

Update network port/cert support for local testing

Author: brentru

src/network_interfaces/Wippersnapper_ESP32.h

@@ -148,14 +148,16 @@ class Wippersnapper_ESP32 : public Wippersnapper {
   void setupMQTTClient(const char *clientID) {
     if (strcmp(WS._config.aio_url, "io.adafruit.com") == 0) {
       _mqtt_client->setCACert(_aio_root_ca_prod);
-    } else {
+    } else if (strcmp(WS._config.aio_url, "io.adafruit.us") == 0) {
       _mqtt_client->setCACert(_aio_root_ca_staging);
+    } else {
+      _mqtt_client->setInsecure();
     }
 
     // Construct MQTT client
-    WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._config.aio_url, 8883,
-                                        clientID, WS._config.aio_user,
-                                        WS._config.aio_key);
+    WS._mqtt = new Adafruit_MQTT_Client(
+        _mqtt_client, WS._config.aio_url, WS._config.io_port, clientID,
+        WS._config.aio_user, WS._config.aio_key);
   }
 
   /********************************************************/

src/network_interfaces/Wippersnapper_ESP8266.h

@@ -173,10 +173,11 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
     // re-compile after. _wifi_client->setFingerprint(fingerprint); WS._mqtt =
     // new Adafruit_MQTT_Client(_wifi_client, WS._config.aio_url,
     // WS._config.io_port, clientID, WS._config.aio_user, WS._config.aio_key);
-
-    WS._mqtt = new Adafruit_MQTT_Client(_wifi_client, WS._config.aio_url, 1883,
-                                        clientID, WS._config.aio_user,
-                                        WS._config.aio_key);
+    if (WS._config.io_port == 8883)
+      WS._config.io_port = 1883;
+    WS._mqtt = new Adafruit_MQTT_Client(
+        _wifi_client, WS._config.aio_url, WS._config.io_port, clientID,
+        WS._config.aio_user, WS._config.aio_key);
   }
 
   /********************************************************/

src/network_interfaces/ws_networking_pico.h

@@ -149,8 +149,10 @@ class ws_networking_pico : public Wippersnapper {
     // compare WS._config.aio_url to "io.adafruit.com"
     if (strcmp(WS._config.aio_url, "io.adafruit.com") == 0) {
       _mqtt_client->setCACert(_aio_root_ca_prod);
-    } else {
+    } else if (strcmp(WS._config.aio_url, "io.adafruit.us") == 0) {
       _mqtt_client->setCACert(_aio_root_ca_staging);
+    } else {
+      _mqtt_client->setInsecure();
     }
 
     WS._mqtt = new Adafruit_MQTT_Client(