Roger A. Light
6 years ago
commit
95bf4a2714
@ -0,0 +1,137 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Test for issue 1322:
|
||||
|
||||
## restart mosquitto
|
||||
#sudo systemctl restart mosquitto.service
|
||||
#
|
||||
## listen on topic1
|
||||
#mosquitto_sub -t "topic1"
|
||||
#
|
||||
## publish to topic1 without clean session
|
||||
#mosquitto_pub -t "topic1" -q 2 -c --id "foobar" -m "message1"
|
||||
## message1 on topic1 is received as expected
|
||||
#
|
||||
## publish to topic2 without clean session
|
||||
## IMPORTANT: no subscription to this topic is present on broker!
|
||||
#mosquitto_pub -t "topic2" -q 2 -c --id "foobar" -m "message2"
|
||||
## this goes nowhere, as no subscriber present
|
||||
#
|
||||
## publish to topic1 without clean session
|
||||
#mosquitto_pub -t "topic1" -q 2 -c --id "foobar" -m "message3"
|
||||
## message3 on topic1 IS NOT RECEIVED
|
||||
#
|
||||
## listen on topic2
|
||||
#mosquitto_sub -t "topic2"
|
||||
#
|
||||
## publish to topic1 without clean session
|
||||
#mosquitto_pub -t "topic1" -q 2 -c --id "foobar" -m "message4"
|
||||
## message2 on topic2 is received incorrectly
|
||||
#
|
||||
## publish to topic1 without clean session
|
||||
#mosquitto_pub -t "topic1" -q 2 -c --id "foobar" -m "message5"
|
||||
## message5 on topic1 is received as expected (message4 was dropped)
|
||||
|
||||
|
||||
|
||||
from mosq_test_helper import *
|
||||
|
||||
rc = 1
|
||||
keepalive = 60
|
||||
pub_connect_packet = mosq_test.gen_connect("pub", keepalive=keepalive, clean_session=False)
|
||||
pub_connack1_packet = mosq_test.gen_connack(rc=0)
|
||||
pub_connack2_packet = mosq_test.gen_connack(rc=0, flags=1)
|
||||
|
||||
sub1_connect_packet = mosq_test.gen_connect("sub1", keepalive=keepalive)
|
||||
sub1_connack_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
sub2_connect_packet = mosq_test.gen_connect("sub2", keepalive=keepalive)
|
||||
sub2_connack_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
mid = 1
|
||||
subscribe1_packet = mosq_test.gen_subscribe(mid, "topic1", 0)
|
||||
suback1_packet = mosq_test.gen_suback(mid, 0)
|
||||
|
||||
mid = 1
|
||||
subscribe2_packet = mosq_test.gen_subscribe(mid, "topic2", 0)
|
||||
suback2_packet = mosq_test.gen_suback(mid, 0)
|
||||
|
||||
# All publishes have the same mid
|
||||
mid = 1
|
||||
pubrec_packet = mosq_test.gen_pubrec(mid)
|
||||
pubrel_packet = mosq_test.gen_pubrel(mid)
|
||||
pubcomp_packet = mosq_test.gen_pubcomp(mid)
|
||||
|
||||
publish1s_packet = mosq_test.gen_publish("topic1", qos=2, mid=mid, payload="message1")
|
||||
publish2s_packet = mosq_test.gen_publish("topic2", qos=2, mid=mid, payload="message2")
|
||||
publish3s_packet = mosq_test.gen_publish("topic1", qos=2, mid=mid, payload="message3")
|
||||
publish4s_packet = mosq_test.gen_publish("topic1", qos=2, mid=mid, payload="message4")
|
||||
publish5s_packet = mosq_test.gen_publish("topic1", qos=2, mid=mid, payload="message5")
|
||||
|
||||
publish1r_packet = mosq_test.gen_publish("topic1", qos=0, payload="message1")
|
||||
publish2r_packet = mosq_test.gen_publish("topic2", qos=0, payload="message2")
|
||||
publish3r_packet = mosq_test.gen_publish("topic1", qos=0, payload="message3")
|
||||
publish4r_packet = mosq_test.gen_publish("topic1", qos=0, payload="message4")
|
||||
publish5r_packet = mosq_test.gen_publish("topic1", qos=0, payload="message5")
|
||||
|
||||
port = mosq_test.get_port()
|
||||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port)
|
||||
|
||||
try:
|
||||
sub1 = mosq_test.do_client_connect(sub1_connect_packet, sub1_connack_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(sub1, subscribe1_packet, suback1_packet, "suback1")
|
||||
|
||||
pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack1_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(pub, publish1s_packet, pubrec_packet, "pubrec1")
|
||||
mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp1")
|
||||
pub.close()
|
||||
|
||||
if mosq_test.expect_packet(sub1, "publish1", publish1r_packet):
|
||||
pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(pub, publish2s_packet, pubrec_packet, "pubrec2")
|
||||
mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp2")
|
||||
pub.close()
|
||||
|
||||
# We expect nothing on sub1
|
||||
mosq_test.do_ping(sub1, error_string="pingresp1")
|
||||
|
||||
pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(pub, publish3s_packet, pubrec_packet, "pubrec3")
|
||||
mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp3")
|
||||
pub.close()
|
||||
|
||||
if mosq_test.expect_packet(sub1, "publish3", publish3r_packet):
|
||||
sub2 = mosq_test.do_client_connect(sub2_connect_packet, sub2_connack_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(sub2, subscribe2_packet, suback2_packet, "suback2")
|
||||
|
||||
pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(pub, publish4s_packet, pubrec_packet, "pubrec4")
|
||||
mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp4")
|
||||
pub.close()
|
||||
|
||||
# We expect nothing on sub2
|
||||
mosq_test.do_ping(sub2, error_string="pingresp2")
|
||||
|
||||
if mosq_test.expect_packet(sub1, "publish4", publish4r_packet):
|
||||
pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port)
|
||||
mosq_test.do_send_receive(pub, publish5s_packet, pubrec_packet, "pubrec5")
|
||||
mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp5")
|
||||
pub.close()
|
||||
|
||||
# We expect nothing on sub2
|
||||
mosq_test.do_ping(sub2, error_string="pingresp2")
|
||||
|
||||
if mosq_test.expect_packet(sub1, "publish5", publish5r_packet):
|
||||
rc = 0
|
||||
|
||||
sub2.close()
|
||||
sub1.close()
|
||||
finally:
|
||||
broker.terminate()
|
||||
broker.wait()
|
||||
(stdo, stde) = broker.communicate()
|
||||
if rc:
|
||||
print(stde.decode('utf-8'))
|
||||
|
||||
exit(rc)
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Test whether a PUBLISH to a topic with QoS 1 results in the correct packet flow.
|
||||
# With max_inflight_messages set to 1
|
||||
|
||||
from mosq_test_helper import *
|
||||
|
||||
def write_config(filename, port):
|
||||
with open(filename, 'w') as f:
|
||||
f.write("port %d\n" % (port))
|
||||
f.write("max_inflight_messages 1\n")
|
||||
|
||||
port = mosq_test.get_port()
|
||||
conf_file = os.path.basename(__file__).replace('.py', '.conf')
|
||||
write_config(conf_file, port)
|
||||
|
||||
|
||||
rc = 1
|
||||
keepalive = 60
|
||||
connect_packet = mosq_test.gen_connect("pub-qos1-test", keepalive=keepalive)
|
||||
connack_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
mid = 311
|
||||
publish_packet = mosq_test.gen_publish("pub/qos1/test", qos=1, mid=mid, payload="message")
|
||||
puback_packet = mosq_test.gen_puback(mid)
|
||||
|
||||
port = mosq_test.get_port()
|
||||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port)
|
||||
|
||||
try:
|
||||
sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port, timeout=10)
|
||||
mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback")
|
||||
|
||||
rc = 0
|
||||
|
||||
sock.close()
|
||||
finally:
|
||||
os.remove(conf_file)
|
||||
broker.terminate()
|
||||
broker.wait()
|
||||
(stdo, stde) = broker.communicate()
|
||||
if rc:
|
||||
print(stde.decode('utf-8'))
|
||||
|
||||
exit(rc)
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Test whether a PUBLISH to a topic with QoS 2 results in the correct packet flow.
|
||||
# With max_inflight_messages set to 1
|
||||
|
||||
from mosq_test_helper import *
|
||||
|
||||
def write_config(filename, port):
|
||||
with open(filename, 'w') as f:
|
||||
f.write("port %d\n" % (port))
|
||||
f.write("max_inflight_messages 1\n")
|
||||
|
||||
port = mosq_test.get_port()
|
||||
conf_file = os.path.basename(__file__).replace('.py', '.conf')
|
||||
write_config(conf_file, port)
|
||||
|
||||
|
||||
rc = 1
|
||||
keepalive = 60
|
||||
connect_packet = mosq_test.gen_connect("pub-qos2-test", keepalive=keepalive)
|
||||
connack_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
mid = 312
|
||||
publish_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload="message")
|
||||
pubrec_packet = mosq_test.gen_pubrec(mid)
|
||||
pubrel_packet = mosq_test.gen_pubrel(mid)
|
||||
pubcomp_packet = mosq_test.gen_pubcomp(mid)
|
||||
|
||||
port = mosq_test.get_port()
|
||||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port)
|
||||
|
||||
try:
|
||||
sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port, timeout=10)
|
||||
mosq_test.do_send_receive(sock, publish_packet, pubrec_packet, "pubrec")
|
||||
mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp")
|
||||
|
||||
rc = 0
|
||||
|
||||
sock.close()
|
||||
finally:
|
||||
os.remove(conf_file)
|
||||
broker.terminate()
|
||||
broker.wait()
|
||||
(stdo, stde) = broker.communicate()
|
||||
if rc:
|
||||
print(stde.decode('utf-8'))
|
||||
|
||||
exit(rc)
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
<!--
|
||||
.. title: Version 1.6.4 released
|
||||
.. slug: version-1-6-4-released
|
||||
.. date: 2019-08-01 18:00:00 UTC+1
|
||||
.. tags: Releases
|
||||
.. category:
|
||||
.. link:
|
||||
.. description:
|
||||
.. type: text
|
||||
-->
|
||||
|
||||
This is a bugfix release.
|
||||
|
||||
## Broker
|
||||
- Fix persistent clients being incorrectly expired on Raspberry Pis.
|
||||
Closes [#1272].
|
||||
- Windows: Allow other applications access to the log file when running.
|
||||
Closes [#515].
|
||||
- Fix incoming QoS 2 messages being blocked when `max_inflight_messages` was
|
||||
set to 1. Closes [#1332].
|
||||
- Fix incoming messages not being removed for a client if the topic being
|
||||
published to does not have any subscribers. Closes [#1322].
|
||||
|
||||
## Client library
|
||||
- Fix MQTT v5 subscription options being incorrectly set for MQTT v3
|
||||
subscriptions. Closes [#1353].
|
||||
- Make behaviour of `mosquitto_connect_async()` consistent with
|
||||
`mosquitto_connect()` when connecting to a non-existent server.
|
||||
Closes [#1345].
|
||||
- `mosquitto_string_option(mosq, MOSQ_OPT_TLS_KEYFORM, ...)` was incorrectly
|
||||
returning `MOSQ_ERR_INVAL` with valid input. This has been fixed.
|
||||
Closes [#1360].
|
||||
- `on_connect` callback is now called with the correct v5 reason code if a v5
|
||||
client connects to a v3.x broker and is sent a CONNACK with the
|
||||
"unacceptable protocol version" connack reason code.
|
||||
- Fix memory leak when setting v5 properties in `mosquitto_connect_v5()`.
|
||||
- Fix properties not being sent on QoS>0 PUBLISH messages.
|
||||
|
||||
## Clients
|
||||
- `mosquitto_pub`: fix error codes not being returned when `mosquitto_pub` exits.
|
||||
Closes [#1354].
|
||||
- All clients: improve error messages when connecting to a v3.x broker when in
|
||||
v5 mode. Closes [#1344].
|
||||
|
||||
## Other
|
||||
- Various documentation fixes.
|
||||
|
||||
[#515]: https://github.com/eclipse/mosquitto/issues/515
|
||||
[#1272]: https://github.com/eclipse/mosquitto/issues/1272
|
||||
[#1322]: https://github.com/eclipse/mosquitto/issues/1322
|
||||
[#1332]: https://github.com/eclipse/mosquitto/issues/1332
|
||||
[#1344]: https://github.com/eclipse/mosquitto/issues/1344
|
||||
[#1345]: https://github.com/eclipse/mosquitto/issues/1345
|
||||
[#1353]: https://github.com/eclipse/mosquitto/issues/1353
|
||||
[#1354]: https://github.com/eclipse/mosquitto/issues/1354
|
||||
[#1360]: https://github.com/eclipse/mosquitto/issues/1360
|
||||
Loading…
Reference in New Issue