* FIX [nmq mqttv3] more support for mqttv3.

nanomq · Jul 6, 2023 · 97e1212 · 97e1212
1 parent 331157b
commit 97e1212
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/sp/protocol/mqtt/mqtt_parser.c b/src/sp/protocol/mqtt/mqtt_parser.c
@@ -588,8 +588,8 @@ conn_handler(uint8_t *packet, conn_param *cparam, size_t max)
 	cparam->will_retain = (cparam->con_flag & 0x20) >> 5;
 	log_trace("conn flag:%x", cparam->con_flag);
 	if ((cparam->will_flag == 1 && cparam->will_qos > 2) ||
-	    (strncmp(cparam->pro_name.body, "MQTT", 4) != 0 &&
-	    strncmp(cparam->pro_name.body, "MQIsdp", 6) != 0) ||
+	    (strncmp(cparam->pro_name.body, MQTT_PROTOCOL_NAME, 4) != 0 &&
+	    strncmp(cparam->pro_name.body, MQTT_PROTOCOL_NAME_v31, 6) != 0) ||
 	    cparam->pro_ver > 5 || cparam->pro_ver < 3)
 		return PROTOCOL_ERROR;
 	pos++;

diff --git a/src/sp/transport/mqtt/broker_tcp.c b/src/sp/transport/mqtt/broker_tcp.c
@@ -544,6 +544,8 @@ nmq_tcptran_pipe_send_cb(void *arg)
 			nmq_pipe_send_start_v4(p, msg, txaio);
 		else if (p->pro_ver == 5)
 			nmq_pipe_send_start_v5(p, msg, txaio);
+		else if (p->pro_ver == 3)
+			nmq_pipe_send_start_v4(p, msg, txaio);
 		else {
 			log_error("msg with pro_ver that neither 4 nor 5 should not happened.");
 			nni_aio_finish_error(txaio, NNG_EPROTO);