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

Rename "resv" in connack to "flags" to better match v5 spec.

Browse Source
This commit is contained in:
Roger A. Light 2019-01-22 12:12:18 +00:00
parent 85615c1bae
commit 0a9885aea1
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/broker/03-publish-b2c-disconnect-qos1.py
View File

@ -8,8 +8,8 @@ rc = 1
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-qos1-disco-test", keepalive=keepalive, clean_session=False)
connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
connack1_packet = mosq_test.gen_connack(flags=0, rc=0)
connack2_packet = mosq_test.gen_connack(flags=1, rc=0)
subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/disconnect/test", 1)
suback_packet = mosq_test.gen_suback(mid, 1)

4
test/broker/03-publish-b2c-disconnect-qos2.py
View File

@ -6,8 +6,8 @@ rc = 1
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-qos2-disco-test", keepalive=keepalive, clean_session=False)
connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
connack1_packet = mosq_test.gen_connack(flags=0, rc=0)
connack2_packet = mosq_test.gen_connack(flags=1, rc=0)
subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/disconnect/test", 2)
suback_packet = mosq_test.gen_suback(mid, 2)

2
test/broker/03-publish-b2c-qos1-len.py
View File

@ -12,7 +12,7 @@ def len_test(test, puback_packet):
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-qos1-test", keepalive=keepalive, clean_session=False, proto_ver=5)
connack_packet = mosq_test.gen_connack(resv=0, rc=0, proto_ver=5)
connack_packet = mosq_test.gen_connack(flags=0, rc=0, proto_ver=5)
subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/len/test", 1, proto_ver=5)
suback_packet = mosq_test.gen_suback(mid, 1, proto_ver=5)

2
test/broker/03-publish-b2c-qos2-len.py
View File

@ -12,7 +12,7 @@ def len_test(test, pubrec_packet, pubcomp_packet):
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-test", keepalive=keepalive, clean_session=False, proto_ver=5)
connack_packet = mosq_test.gen_connack(resv=0, rc=0, proto_ver=5)
connack_packet = mosq_test.gen_connack(flags=0, rc=0, proto_ver=5)
subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/len/test", 2, proto_ver=5)
suback_packet = mosq_test.gen_suback(mid, 2, proto_ver=5)

2
test/broker/03-publish-c2b-disconnect-qos2.py
View File

@ -6,7 +6,7 @@ rc = 1
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-qos2-disco-test", keepalive=keepalive, clean_session=False, proto_ver=3)
connack_packet = mosq_test.gen_connack(resv=0, rc=0)
connack_packet = mosq_test.gen_connack(flags=0, rc=0)
subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/disconnect/test", 2)
suback_packet = mosq_test.gen_suback(mid, 2)

2
test/broker/03-publish-c2b-qos2-len.py
View File

@ -12,7 +12,7 @@ def len_test(test, pubrel_packet):
mid = 3265
keepalive = 60
connect_packet = mosq_test.gen_connect("pub-test", keepalive=keepalive, clean_session=False, proto_ver=5)
connack_packet = mosq_test.gen_connack(resv=0, rc=0, proto_ver=5)
connack_packet = mosq_test.gen_connack(flags=0, rc=0, proto_ver=5)
mid = 1
publish_packet = mosq_test.gen_publish("qos2/len/test", qos=2, mid=mid, payload="len-message", proto_ver=5)

4
test/broker/05-clean-session-qos1.py
View File

@ -8,8 +8,8 @@ rc = 1
mid = 109
keepalive = 60
connect_packet = mosq_test.gen_connect("clean-qos2-test", keepalive=keepalive, clean_session=False)
connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
connack1_packet = mosq_test.gen_connack(flags=0, rc=0)
connack2_packet = mosq_test.gen_connack(flags=1, rc=0)
disconnect_packet = mosq_test.gen_disconnect()

2
test/broker/11-persistent-subscription.py
View File

@ -21,7 +21,7 @@ connect_packet = mosq_test.gen_connect(
"persitent-subscription-test", keepalive=keepalive, clean_session=False,
)
connack_packet = mosq_test.gen_connack(rc=0)
connack_packet2 = mosq_test.gen_connack(rc=0, resv=1) # session present
connack_packet2 = mosq_test.gen_connack(rc=0, flags=1) # session present
subscribe_packet = mosq_test.gen_subscribe(mid, "subpub/qos1", 1)
suback_packet = mosq_test.gen_suback(mid, 1)

6
test/mosq_test.py
View File

@ -366,14 +366,14 @@ def gen_connect(client_id, clean_session=True, keepalive=60, username=None, pass
packet = packet + struct.pack("!H"+str(len(password))+"s", len(password), password)
return packet
def gen_connack(resv=0, rc=0, proto_ver=4, properties=""):
def gen_connack(flags=0, rc=0, proto_ver=4, properties=""):
if proto_ver == 5:
properties += mqtt5_props.gen_byte_prop(mqtt5_props.PROP_SHARED_SUB_AVAILABLE, 0)
properties = mqtt5_props.prop_finalise(properties)
packet = struct.pack('!BBBB', 32, 2+len(properties), resv, rc) + properties
packet = struct.pack('!BBBB', 32, 2+len(properties), flags, rc) + properties
else:
packet = struct.pack('!BBBB', 32, 2, resv, rc);
packet = struct.pack('!BBBB', 32, 2, flags, rc);
return packet