From 4ae6820093cadae4da0bbb96658a296155ca3ebe Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Sun, 8 Jan 2023 22:07:46 +0100 Subject: [PATCH 1/2] do not hard-code TLS port value --- adafruit_minimqtt/adafruit_minimqtt.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/adafruit_minimqtt/adafruit_minimqtt.py b/adafruit_minimqtt/adafruit_minimqtt.py index 00bace2b..1f3f832f 100644 --- a/adafruit_minimqtt/adafruit_minimqtt.py +++ b/adafruit_minimqtt/adafruit_minimqtt.py @@ -124,7 +124,8 @@ class MQTT: """MQTT Client for CircuitPython. :param str broker: MQTT Broker URL or IP Address. - :param int port: Optional port definition, defaults to 8883. + :param int port: Optional port definition, defaults to MQTT_TLS_PORT if is_ssl is set, + MQTT_TCP_PORT otherwise. :param str username: Username for broker authentication. :param str password: Password for broker authentication. :param network_manager: NetworkManager object, such as WiFiManager from ESPSPI_WiFiManager. @@ -252,7 +253,7 @@ def _get_connect_socket(self, host, port, *, timeout=1): if not isinstance(port, int): raise RuntimeError("Port must be an integer") - if port == 8883 and not self._ssl_context: + if port == MQTT_TLS_PORT and not self._ssl_context: raise RuntimeError( "ssl_context must be set before using adafruit_mqtt for secure MQTT." ) @@ -282,7 +283,7 @@ def _get_connect_socket(self, host, port, *, timeout=1): continue connect_host = addr_info[-1][0] - if port == 8883: + if port == MQTT_TLS_PORT: sock = self._ssl_context.wrap_socket(sock, server_hostname=host) connect_host = host sock.settimeout(timeout) From 79e58f64fae4e9824463bc9bdc73beab56229a73 Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Sun, 8 Jan 2023 22:10:44 +0100 Subject: [PATCH 2/2] improve wording --- adafruit_minimqtt/adafruit_minimqtt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_minimqtt/adafruit_minimqtt.py b/adafruit_minimqtt/adafruit_minimqtt.py index 1f3f832f..c53ad9bd 100644 --- a/adafruit_minimqtt/adafruit_minimqtt.py +++ b/adafruit_minimqtt/adafruit_minimqtt.py @@ -124,7 +124,7 @@ class MQTT: """MQTT Client for CircuitPython. :param str broker: MQTT Broker URL or IP Address. - :param int port: Optional port definition, defaults to MQTT_TLS_PORT if is_ssl is set, + :param int port: Optional port definition, defaults to MQTT_TLS_PORT if is_ssl is True, MQTT_TCP_PORT otherwise. :param str username: Username for broker authentication. :param str password: Password for broker authentication.