github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mosq_test.py to_string() on Python 3

Browse Source
pull/1920/head
Roger A. Light 5 years ago
parent b34dcd2a67
commit 7d05f70fe1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

20
test/mosq_test.py
Unescape Escape View File

@ -201,7 +201,7 @@ def to_string(packet):
if len(packet) == 0: if len(packet) == 0:
return "" return ""
packet0 = struct.unpack("!B", bytes(packet[0])) packet0 = struct.unpack("!B%ds" % (len(packet)-1), bytes(packet))
packet0 = packet0[0] packet0 = packet0[0]
cmd = packet0 & 0xF0 cmd = packet0 & 0xF0
if cmd == 0x00: if cmd == 0x00:
@ -214,7 +214,7 @@ def to_string(packet):
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(slen)+'sBBH' + str(len(packet)-slen-4) + 's' pack_format = "!" + str(slen)+'sBBH' + str(len(packet)-slen-4) + 's'
(protocol, proto_ver, flags, keepalive, packet) = struct.unpack(pack_format, packet) (protocol, proto_ver, flags, keepalive, packet) = struct.unpack(pack_format, packet)
s = "CONNECT, proto="+protocol+str(proto_ver)+", keepalive="+str(keepalive) s = "CONNECT, proto="+str(protocol)+str(proto_ver)+", keepalive="+str(keepalive)
if flags&2: if flags&2:
s = s+", clean-session" s = s+", clean-session"
else: else:
@ -224,14 +224,14 @@ def to_string(packet):
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's' pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's'
(client_id, packet) = struct.unpack(pack_format, packet) (client_id, packet) = struct.unpack(pack_format, packet)
s = s+", id="+client_id s = s+", id="+str(client_id)
if flags&4: if flags&4:
pack_format = "!H" + str(len(packet)-2) + 's' pack_format = "!H" + str(len(packet)-2) + 's'
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's' pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's'
(will_topic, packet) = struct.unpack(pack_format, packet) (will_topic, packet) = struct.unpack(pack_format, packet)
s = s+", will-topic="+will_topic s = s+", will-topic="+str(will_topic)
pack_format = "!H" + str(len(packet)-2) + 's' pack_format = "!H" + str(len(packet)-2) + 's'
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
@ -247,14 +247,14 @@ def to_string(packet):
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's' pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's'
(username, packet) = struct.unpack(pack_format, packet) (username, packet) = struct.unpack(pack_format, packet)
s = s+", username="+username s = s+", username="+str(username)
if flags&64: if flags&64:
pack_format = "!H" + str(len(packet)-2) + 's' pack_format = "!H" + str(len(packet)-2) + 's'
(slen, packet) = struct.unpack(pack_format, packet) (slen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's' pack_format = "!" + str(slen)+'s' + str(len(packet)-slen) + 's'
(password, packet) = struct.unpack(pack_format, packet) (password, packet) = struct.unpack(pack_format, packet)
s = s+", password="+password s = s+", password="+str(password)
if flags&1: if flags&1:
s = s+", reserved=1" s = s+", reserved=1"
@ -274,13 +274,13 @@ def to_string(packet):
(tlen, packet) = struct.unpack(pack_format, packet) (tlen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(tlen)+'s' + str(len(packet)-tlen) + 's' pack_format = "!" + str(tlen)+'s' + str(len(packet)-tlen) + 's'
(topic, packet) = struct.unpack(pack_format, packet) (topic, packet) = struct.unpack(pack_format, packet)
s = "PUBLISH, rl="+str(rl)+", topic="+topic+", qos="+str(qos)+", retain="+str(retain)+", dup="+str(dup) s = "PUBLISH, rl="+str(rl)+", topic="+str(topic)+", qos="+str(qos)+", retain="+str(retain)+", dup="+str(dup)
if qos > 0: if qos > 0:
pack_format = "!H" + str(len(packet)-2) + 's' pack_format = "!H" + str(len(packet)-2) + 's'
(mid, packet) = struct.unpack(pack_format, packet) (mid, packet) = struct.unpack(pack_format, packet)
s = s + ", mid="+str(mid) s = s + ", mid="+str(mid)
s = s + ", payload="+packet s = s + ", payload="+str(packet)
return s return s
elif cmd == 0x40: elif cmd == 0x40:
# PUBACK # PUBACK
@ -311,7 +311,7 @@ def to_string(packet):
(tlen, packet) = struct.unpack(pack_format, packet) (tlen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(tlen)+'sB' + str(len(packet)-tlen-1) + 's' pack_format = "!" + str(tlen)+'sB' + str(len(packet)-tlen-1) + 's'
(topic, qos, packet) = struct.unpack(pack_format, packet) (topic, qos, packet) = struct.unpack(pack_format, packet)
s = s + ", topic"+str(topic_index)+"="+topic+","+str(qos) s = s + ", topic"+str(topic_index)+"="+str(topic)+","+str(qos)
return s return s
elif cmd == 0x90: elif cmd == 0x90:
# SUBACK # SUBACK
@ -337,7 +337,7 @@ def to_string(packet):
(tlen, packet) = struct.unpack(pack_format, packet) (tlen, packet) = struct.unpack(pack_format, packet)
pack_format = "!" + str(tlen)+'s' + str(len(packet)-tlen) + 's' pack_format = "!" + str(tlen)+'s' + str(len(packet)-tlen) + 's'
(topic, packet) = struct.unpack(pack_format, packet) (topic, packet) = struct.unpack(pack_format, packet)
s = s + ", topic"+str(topic_index)+"="+topic s = s + ", topic"+str(topic_index)+"="+str(topic)
return s return s
elif cmd == 0xB0: elif cmd == 0xB0:
# UNSUBACK # UNSUBACK

Write Preview
Loading…
Cancel
Save