提交 06eb000a 编写于 作者: R Roger A. Light

Fix CONNECT packet for MQTT v3.1.1.

上级 72f5b7c8
v0.9.1
======
- Fix CONNECT packet for MQTT v3.1.1.
...@@ -1684,7 +1684,13 @@ class Client(object): ...@@ -1684,7 +1684,13 @@ class Client(object):
return self._packet_queue(command, packet, 0, 0) return self._packet_queue(command, packet, 0, 0)
def _send_connect(self, keepalive, clean_session): def _send_connect(self, keepalive, clean_session):
remaining_length = 12 + 2+len(self._client_id) if self._protocol == MQTTv31:
protocol = PROTOCOL_NAMEv31
proto_ver = 3
else:
protocol = PROTOCOL_NAMEv311
proto_ver = 4
remaining_length = 2+len(protocol) + 1+1+2 + 2+len(self._client_id)
connect_flags = 0 connect_flags = 0
if clean_session: if clean_session:
connect_flags = connect_flags | 0x02 connect_flags = connect_flags | 0x02
...@@ -1708,12 +1714,6 @@ class Client(object): ...@@ -1708,12 +1714,6 @@ class Client(object):
packet = bytearray() packet = bytearray()
packet.extend(struct.pack("!B", command)) packet.extend(struct.pack("!B", command))
self._pack_remaining_length(packet, remaining_length) self._pack_remaining_length(packet, remaining_length)
if self._protocol == MQTTv31:
protocol = PROTOCOL_NAMEv31
proto_ver = 3
else:
protocol = PROTOCOL_NAMEv311
proto_ver = 4
packet.extend(struct.pack("!H"+str(len(protocol))+"sBBH", len(protocol), protocol, proto_ver, connect_flags, keepalive)) packet.extend(struct.pack("!H"+str(len(protocol))+"sBBH", len(protocol), protocol, proto_ver, connect_flags, keepalive))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册