* FIX [mqtt/transport] fix #22 alloc tmaio before nego

emqx · Feb 14, 2022 · d187ba1 · d187ba1
1 parent 3dee579
commit d187ba1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/mqtt/transport/tcp/mqtt_tcp.c b/src/mqtt/transport/tcp/mqtt_tcp.c
@@ -190,7 +190,6 @@ mqtt_tcptran_pipe_init(void *arg, nni_pipe *npipe)
 	p->npipe             = npipe;
 
 	nni_lmq_init(&p->rslmq, 16);
-	nni_aio_init(&p->tmaio, mqtt_pipe_timer_cb, p);
 	p->busy = false;
 	nni_sleep_aio(p->keepalive, &p->tmaio);
 	return (0);
@@ -246,6 +245,8 @@ mqtt_tcptran_pipe_alloc(mqtt_tcptran_pipe **pipep)
 		return (NNG_ENOMEM);
 	}
 	nni_mtx_init(&p->mtx);
+	// alloc timer aio first, but only start it when nego is completed
+	nni_aio_init(&p->tmaio, mqtt_pipe_timer_cb, p);
 	if (((rv = nni_aio_alloc(&p->txaio, mqtt_tcptran_pipe_send_cb, p)) !=
 	        0) ||
 	    ((rv = nni_aio_alloc(&p->rxaio, mqtt_tcptran_pipe_recv_cb, p)) !=