From 2b2279363b3e40865eb6c1d2172205182130b841 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 22 Jun 2016 00:04:47 +0100 Subject: [PATCH] Bridge defaults to mqtt3.1.1 as per documentation. --- src/conf.c | 2 +- test/broker/06-bridge-b2br-disconnect-qos1.py | 2 +- test/broker/06-bridge-b2br-disconnect-qos2.py | 2 +- test/broker/06-bridge-br2b-disconnect-qos1.py | 2 +- test/broker/06-bridge-br2b-disconnect-qos2.py | 2 +- test/broker/06-bridge-fail-persist-resend-qos1.py | 2 +- test/broker/06-bridge-fail-persist-resend-qos2.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf.c b/src/conf.c index a31f904b..bda6e109 100644 --- a/src/conf.c +++ b/src/conf.c @@ -970,7 +970,7 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, const cur_bridge->threshold = 10; cur_bridge->try_private = true; cur_bridge->attempt_unsubscribe = true; - cur_bridge->protocol_version = mosq_p_mqtt31; + cur_bridge->protocol_version = mosq_p_mqtt311; }else{ log__printf(NULL, MOSQ_LOG_ERR, "Error: Empty connection value in configuration."); return MOSQ_ERR_INVAL; diff --git a/test/broker/06-bridge-b2br-disconnect-qos1.py b/test/broker/06-bridge-b2br-disconnect-qos1.py index e48003e3..16941dd9 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos1.py +++ b/test/broker/06-bridge-b2br-disconnect-qos1.py @@ -15,7 +15,7 @@ import mosq_test rc = 1 keepalive = 60 client_id = socket.gethostname()+".bridge_sample" -connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+3) +connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+4) connack_packet = mosq_test.gen_connack(rc=0) mid = 1 diff --git a/test/broker/06-bridge-b2br-disconnect-qos2.py b/test/broker/06-bridge-b2br-disconnect-qos2.py index 243eb616..d22f6d0f 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos2.py +++ b/test/broker/06-bridge-b2br-disconnect-qos2.py @@ -15,7 +15,7 @@ import mosq_test rc = 1 keepalive = 60 client_id = socket.gethostname()+".bridge_sample" -connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+3) +connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+4) connack_packet = mosq_test.gen_connack(rc=0) mid = 1 diff --git a/test/broker/06-bridge-br2b-disconnect-qos1.py b/test/broker/06-bridge-br2b-disconnect-qos1.py index 9047d455..6338c46d 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos1.py +++ b/test/broker/06-bridge-br2b-disconnect-qos1.py @@ -16,7 +16,7 @@ import mosq_test rc = 1 keepalive = 60 client_id = socket.gethostname()+".bridge_sample" -connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+3) +connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+4) connack_packet = mosq_test.gen_connack(rc=0) mid = 1 diff --git a/test/broker/06-bridge-br2b-disconnect-qos2.py b/test/broker/06-bridge-br2b-disconnect-qos2.py index acb105af..dda7dc88 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos2.py +++ b/test/broker/06-bridge-br2b-disconnect-qos2.py @@ -16,7 +16,7 @@ import mosq_test rc = 1 keepalive = 60 client_id = socket.gethostname()+".bridge_sample" -connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+3) +connect_packet = mosq_test.gen_connect(client_id, keepalive=keepalive, clean_session=False, proto_ver=128+4) connack_packet = mosq_test.gen_connack(rc=0) mid = 1 diff --git a/test/broker/06-bridge-fail-persist-resend-qos1.py b/test/broker/06-bridge-fail-persist-resend-qos1.py index 5b8219c1..0b4e93c4 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos1.py +++ b/test/broker/06-bridge-fail-persist-resend-qos1.py @@ -16,7 +16,7 @@ import mosq_test rc = 1 keepalive = 60 -connect_packet = mosq_test.gen_connect("bridge-u-test", keepalive=keepalive, proto_ver=3) +connect_packet = mosq_test.gen_connect("bridge-u-test", keepalive=keepalive) connack_packet = mosq_test.gen_connack(rc=0) mid = 180 diff --git a/test/broker/06-bridge-fail-persist-resend-qos2.py b/test/broker/06-bridge-fail-persist-resend-qos2.py index fc97128b..e6b0b5e7 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos2.py +++ b/test/broker/06-bridge-fail-persist-resend-qos2.py @@ -16,7 +16,7 @@ import mosq_test rc = 1 keepalive = 60 -connect_packet = mosq_test.gen_connect("bridge-u-test", keepalive=keepalive, proto_ver=3) +connect_packet = mosq_test.gen_connect("bridge-u-test", keepalive=keepalive) connack_packet = mosq_test.gen_connack(rc=0) mid = 180