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

Fix and tests for client side receive-maximum.

Browse Source
pull/1203/head
Roger A. Light 7 years ago
parent 84660e1cbe
commit aeba5b5d0d
8 changed files with 333 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
lib/handle_connack.c
Unescape Escape View File

@ -63,6 +63,7 @@ int handle__connack(struct mosquitto *mosq)
mosquitto_property_read_int16(properties, MQTT_PROP_SERVER_KEEP_ALIVE, &mosq->keepalive, false);
mosquitto_property_read_int16(properties, MQTT_PROP_RECEIVE_MAXIMUM, &mosq->send_maximum, false);
mosq->send_quota = mosq->send_maximum;
log__printf(mosq, MOSQ_LOG_DEBUG, "Client %s received CONNACK (%d)", mosq->id, reason_code);
pthread_mutex_lock(&mosq->callback_mutex);

102
test/lib/03-publish-c2b-qos1-receive-maximum.py
Unescape Escape View File

@ -0,0 +1,102 @@
#!/usr/bin/env python
# Test whether a client responds correctly to multiple PUBLISH with QoS 1, with
# receive maximum set to 3.
from mosq_test_helper import *
port = mosq_test.get_lib_port()
rc = 1
keepalive = 60
connect_packet = mosq_test.gen_connect("publish-qos1-test", keepalive=keepalive, proto_ver=5)
props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 3)
connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5, properties=props)
disconnect_packet = mosq_test.gen_disconnect(proto_ver=5)
mid = 1
publish_1_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_1_packet = mosq_test.gen_puback(mid, proto_ver=5)
mid = 2
publish_2_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_2_packet = mosq_test.gen_puback(mid, proto_ver=5)
mid = 3
publish_3_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_3_packet = mosq_test.gen_puback(mid, proto_ver=5)
mid = 4
publish_4_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_4_packet = mosq_test.gen_puback(mid, proto_ver=5)
mid = 5
publish_5_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_5_packet = mosq_test.gen_puback(mid, proto_ver=5)
mid = 6
publish_6_packet = mosq_test.gen_publish("topic", qos=1, mid=mid, payload="12345", proto_ver=5)
puback_6_packet = mosq_test.gen_puback(mid, proto_ver=5)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.settimeout(10)
sock.bind(('', port))
sock.listen(5)
client_args = sys.argv[1:]
env = dict(os.environ)
env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp'
try:
pp = env['PYTHONPATH']
except KeyError:
pp = ''
env['PYTHONPATH'] = '../../lib/python:'+pp
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
try:
(conn, address) = sock.accept()
conn.settimeout(10)
if mosq_test.expect_packet(conn, "connect", connect_packet):
conn.send(connack_packet)
if mosq_test.expect_packet(conn, "publish 1", publish_1_packet):
if mosq_test.expect_packet(conn, "publish 2", publish_2_packet):
if mosq_test.expect_packet(conn, "publish 3", publish_3_packet):
conn.send(puback_1_packet)
conn.send(puback_2_packet)
if mosq_test.expect_packet(conn, "publish 4", publish_4_packet):
if mosq_test.expect_packet(conn, "publish 5", publish_5_packet):
conn.send(puback_3_packet)
if mosq_test.expect_packet(conn, "publish 6", publish_6_packet):
conn.send(puback_4_packet)
conn.send(puback_5_packet)
conn.send(puback_6_packet)
rc = 0
conn.close()
finally:
for i in range(0, 5):
if client.returncode != None:
break
time.sleep(0.1)
try:
client.terminate()
except OSError:
pass
client.wait()
sock.close()
if client.returncode != 0:
exit(1)
exit(rc)

119
test/lib/03-publish-c2b-qos2-receive-maximum.py
Unescape Escape View File

@ -0,0 +1,119 @@
#!/usr/bin/env python
# Test whether a client responds correctly to multiple PUBLISH with QoS 2, with
# receive maximum set to 2.
from mosq_test_helper import *
port = mosq_test.get_lib_port()
rc = 1
keepalive = 60
connect_packet = mosq_test.gen_connect("publish-qos2-test", keepalive=keepalive, proto_ver=5)
props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 2)
connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5, properties=props)
disconnect_packet = mosq_test.gen_disconnect(proto_ver=5)
mid = 1
publish_1_packet = mosq_test.gen_publish("topic", qos=2, mid=mid, payload="12345", proto_ver=5)
pubrec_1_packet = mosq_test.gen_pubrec(mid, proto_ver=5)
pubrel_1_packet = mosq_test.gen_pubrel(mid, proto_ver=5)
pubcomp_1_packet = mosq_test.gen_pubcomp(mid, proto_ver=5)
mid = 2
publish_2_packet = mosq_test.gen_publish("topic", qos=2, mid=mid, payload="12345", proto_ver=5)
pubrec_2_packet = mosq_test.gen_pubrec(mid, proto_ver=5)
pubrel_2_packet = mosq_test.gen_pubrel(mid, proto_ver=5)
pubcomp_2_packet = mosq_test.gen_pubcomp(mid, proto_ver=5)
mid = 3
publish_3_packet = mosq_test.gen_publish("topic", qos=2, mid=mid, payload="12345", proto_ver=5)
pubrec_3_packet = mosq_test.gen_pubrec(mid, proto_ver=5)
pubrel_3_packet = mosq_test.gen_pubrel(mid, proto_ver=5)
pubcomp_3_packet = mosq_test.gen_pubcomp(mid, proto_ver=5)
mid = 4
publish_4_packet = mosq_test.gen_publish("topic", qos=2, mid=mid, payload="12345", proto_ver=5)
pubrec_4_packet = mosq_test.gen_pubrec(mid, proto_ver=5)
pubrel_4_packet = mosq_test.gen_pubrel(mid, proto_ver=5)
pubcomp_4_packet = mosq_test.gen_pubcomp(mid, proto_ver=5)
mid = 5
publish_5_packet = mosq_test.gen_publish("topic", qos=2, mid=mid, payload="12345", proto_ver=5)
pubrec_5_packet = mosq_test.gen_pubrec(mid, proto_ver=5)
pubrel_5_packet = mosq_test.gen_pubrel(mid, proto_ver=5)
pubcomp_5_packet = mosq_test.gen_pubcomp(mid, proto_ver=5)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.settimeout(10)
sock.bind(('', port))
sock.listen(5)
client_args = sys.argv[1:]
env = dict(os.environ)
env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp'
try:
pp = env['PYTHONPATH']
except KeyError:
pp = ''
env['PYTHONPATH'] = '../../lib/python:'+pp
client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port)
try:
(conn, address) = sock.accept()
conn.settimeout(10)
if mosq_test.expect_packet(conn, "connect", connect_packet):
conn.send(connack_packet)
if mosq_test.expect_packet(conn, "publish 1", publish_1_packet):
if mosq_test.expect_packet(conn, "publish 2", publish_2_packet):
conn.send(pubrec_1_packet)
conn.send(pubrec_2_packet)
if mosq_test.expect_packet(conn, "pubrel 1", pubrel_1_packet):
if mosq_test.expect_packet(conn, "pubrel 2", pubrel_2_packet):
conn.send(pubcomp_1_packet)
conn.send(pubcomp_2_packet)
if mosq_test.expect_packet(conn, "publish 3", publish_3_packet):
if mosq_test.expect_packet(conn, "publish 4", publish_4_packet):
conn.send(pubrec_3_packet)
conn.send(pubrec_4_packet)
if mosq_test.expect_packet(conn, "pubrel 3", pubrel_3_packet):
if mosq_test.expect_packet(conn, "pubrel 4", pubrel_4_packet):
conn.send(pubcomp_3_packet)
conn.send(pubcomp_4_packet)
if mosq_test.expect_packet(conn, "publish 5", publish_5_packet):
conn.send(pubrec_5_packet)
if mosq_test.expect_packet(conn, "pubrel 5", pubrel_5_packet):
conn.send(pubcomp_5_packet)
rc = 0
conn.close()
finally:
for i in range(0, 5):
if client.returncode != None:
break
time.sleep(0.1)
try:
client.terminate()
except OSError:
pass
client.wait()
sock.close()
if client.returncode != 0:
exit(1)
exit(rc)

2
test/lib/Makefile
Unescape Escape View File

@ -36,6 +36,8 @@ c : test-compile
./03-publish-c2b-qos1-disconnect.py $@/03-publish-c2b-qos1-disconnect.test
./03-publish-c2b-qos2.py $@/03-publish-c2b-qos2.test
./03-publish-c2b-qos2-disconnect.py $@/03-publish-c2b-qos2-disconnect.test
./03-publish-c2b-qos1-receive-maximum.py $@/03-publish-c2b-qos1-receive-maximum.test
./03-publish-c2b-qos2-receive-maximum.py $@/03-publish-c2b-qos2-receive-maximum.test
./03-publish-b2c-qos1.py $@/03-publish-b2c-qos1.test
./03-publish-b2c-qos2.py $@/03-publish-b2c-qos2.test
./03-request-response.py $@/03-request-response.test

52
test/lib/c/03-publish-c2b-qos1-receive-maximum.c
Unescape Escape View File

@ -0,0 +1,52 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <mosquitto.h>
static int run = -1;
void on_connect(struct mosquitto *mosq, void *obj, int rc, int flags, const mosquitto_property *properties)
{
if(rc){
exit(1);
}
for(int i=0; i<6; i++){
mosquitto_publish_v5(mosq, NULL, "topic", 5, "12345", 1, false, NULL);
}
}
void on_publish(struct mosquitto *mosq, void *obj, int mid, const mosquitto_property *properties)
{
if(mid == 6){
mosquitto_disconnect(mosq);
run = 0;
}
}
int main(int argc, char *argv[])
{
int rc;
struct mosquitto *mosq;
mosquitto_property *props = NULL;
int port = atoi(argv[1]);
mosquitto_lib_init();
mosq = mosquitto_new("publish-qos1-test", true, &run);
mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
mosquitto_connect_v5_callback_set(mosq, on_connect);
mosquitto_publish_v5_callback_set(mosq, on_publish);
rc = mosquitto_connect_bind_v5(mosq, "localhost", port, 60, NULL, NULL);
while(run == -1){
mosquitto_loop(mosq, 300, 1);
}
mosquitto_lib_cleanup();
return run;
}

52
test/lib/c/03-publish-c2b-qos2-receive-maximum.c
Unescape Escape View File

@ -0,0 +1,52 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <mosquitto.h>
static int run = -1;
void on_connect(struct mosquitto *mosq, void *obj, int rc, int flags, const mosquitto_property *properties)
{
if(rc){
exit(1);
}
for(int i=0; i<5; i++){
mosquitto_publish_v5(mosq, NULL, "topic", 5, "12345", 2, false, NULL);
}
}
void on_publish(struct mosquitto *mosq, void *obj, int mid, const mosquitto_property *properties)
{
if(mid == 5){
mosquitto_disconnect(mosq);
run = 0;
}
}
int main(int argc, char *argv[])
{
int rc;
struct mosquitto *mosq;
mosquitto_property *props = NULL;
int port = atoi(argv[1]);
mosquitto_lib_init();
mosq = mosquitto_new("publish-qos2-test", true, &run);
mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
mosquitto_connect_v5_callback_set(mosq, on_connect);
mosquitto_publish_v5_callback_set(mosq, on_publish);
rc = mosquitto_connect_bind_v5(mosq, "localhost", port, 60, NULL, NULL);
while(run == -1){
mosquitto_loop(mosq, 300, 1);
}
mosquitto_lib_cleanup();
return run;
}

4
test/lib/c/Makefile
Unescape Escape View File

@ -19,11 +19,13 @@ SRC = \
03-publish-c2b-qos1-disconnect.c \
03-publish-c2b-qos2.c \
03-publish-c2b-qos2-disconnect.c \
03-publish-c2b-qos1-receive-maximum.c \
03-publish-c2b-qos2-receive-maximum.c \
03-publish-b2c-qos1.c \
03-publish-b2c-qos2.c \
03-request-response-1.c \
03-request-response-2.c \
03-request-response-correlation-1.c \
03-publish-b2c-qos2.c \
04-retain-qos0.c \
08-ssl-connect-no-auth.c \
08-ssl-connect-cert-auth.c \

2
test/lib/ptest.py
Unescape Escape View File

@ -21,6 +21,8 @@ tests = [
('./03-publish-c2b-qos1-disconnect.py', 'c/03-publish-c2b-qos1-disconnect.test'),
('./03-publish-c2b-qos2-disconnect.py', 'c/03-publish-c2b-qos2-disconnect.test'),
('./03-publish-c2b-qos2.py', 'c/03-publish-c2b-qos2.test'),
('./03-publish-c2b-qos1-receive-maximum.py', 'c/03-publish-c2b-qos1-receive-maximum.test'),
('./03-publish-c2b-qos2-receive-maximum.py', 'c/03-publish-c2b-qos2-receive-maximum.test'),
('./03-publish-qos0-no-payload.py', 'c/03-publish-qos0-no-payload.test'),
('./03-publish-qos0.py', 'c/03-publish-qos0.test'),
('./03-request-response.py', 'c/03-request-response.test'),

Write Preview
Loading…
Cancel
Save