From 01628e25a64eb3d69390871dc87d1ca1aa9d4fb6 Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 27 Sep 2015 21:16:55 +0200 Subject: [PATCH] Fix port init. --- hbmqtt/client.py | 7 ++++--- tests/client/__init__.py | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tests/client/__init__.py diff --git a/hbmqtt/client.py b/hbmqtt/client.py index 2740589..46c1c2c 100644 --- a/hbmqtt/client.py +++ b/hbmqtt/client.py @@ -214,6 +214,7 @@ class MQTTClient: # Decode URI attributes uri_attributes = urlparse(self.session.broker_uri) scheme = uri_attributes.scheme + secure = True if scheme in ('mqtts', 'wss') else False self.session.username = uri_attributes.username self.session.password = uri_attributes.password self.session.remote_address = uri_attributes.hostname @@ -221,14 +222,14 @@ class MQTTClient: if scheme in ('mqtt', 'mqtts') and not self.session.remote_port: self.session.remote_port = 8883 if scheme == 'mqtts' else 1883 if scheme in ('ws', 'wss') and not self.session.remote_port: - self.session.remote_port = 443 if scheme == 'mqtts' else 80 + self.session.remote_port = 443 if scheme == 'wss' else 80 if scheme in ('ws', 'wss'): # Rewrite URI to conform to https://tools.ietf.org/html/rfc6455#section-3 - uri = (uri_attributes[0], uri_attributes.hostname + ":" + str(uri_attributes.port), uri_attributes[2], + uri = (scheme, self.session.remote_address + ":" + str(self.session.remote_port), uri_attributes[2], uri_attributes[3], uri_attributes[4], uri_attributes[5]) self.session.broker_uri = urlunparse(uri) - if scheme in ('mqtts', 'wss'): + if secure: if self.session.cafile is None or self.session.cafile == '': self.logger.warn("TLS connection can't be estabilshed, no certificate file (.cert) given") raise ClientException("TLS connection can't be estabilshed, no certificate file (.cert) given") diff --git a/tests/client/__init__.py b/tests/client/__init__.py deleted file mode 100644 index e1bd617..0000000 --- a/tests/client/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'nico'