RyanCW пре 4 месеци
родитељ
комит
3fc067fb18
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      mqttclient/RyanMqttThread.c
  2. 1 1
      mqttclient/RyanMqttUtileAck.c

+ 1 - 1
mqttclient/RyanMqttThread.c

@@ -45,7 +45,7 @@ static RyanMqttError_e RyanMqttKeepalive(RyanMqttClient_t *client)
 	}
 
 	// 当剩余时间大于 recvtimeout 并且小于 keepaliveTimeoutS 的 0.9 倍时间时不进行发送心跳包
-	if (timeRemain - client->config.recvTimeout > 100)
+	if (timeRemain > (uint32_t)(client->config.recvTimeout + 100))
 	{
 		// 当没有到达 keepaliveTimeoutS 的 0.9 倍时间时不进行发送心跳包
 		if (timeRemain > client->config.keepaliveTimeoutS * 1000 * (RyanMqttKeepAliveMultiplier - 0.9))

+ 1 - 1
mqttclient/RyanMqttUtileAck.c

@@ -216,7 +216,7 @@ RyanMqttError_e RyanMqttAckListNodeFindByUserAckList(RyanMqttClient_t *client, u
 			result = RyanMqttSuccessError;
 			if (RyanMqttTrue == removeOnMatch)
 			{
-				RyanMqttAckListRemoveToAckList(client, ackHandler);
+				RyanMqttAckListRemoveToUserAckList(client, ackHandler);
 			}
 			goto __exit;
 		}