Skip to content

在RT-Thread中，rt_mq_recv的返回值是收到消息的长度，修改umqtt.c中对其返回值的错误判断 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yplwrt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

在RT-Thread中，rt_mq_recv的返回值是收到消息的长度，修改umqtt.c中对其返回值的错误判断 #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/umqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ int umqtt_start(struct umqtt_client *client)
set_uplink_recon_tick(client, UPLINK_LAST_TICK);

rt_memset(&msg_ack, 0, sizeof(msg_ack));
if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
{
Expand Down Expand Up @@ -1512,7 +1512,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
_ret = UMQTT_OK;
if (qos == UMQTT_QOS1)
{
if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(timeout)))
{
Expand Down Expand Up @@ -1547,7 +1547,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
}
else if (qos == UMQTT_QOS2)
{
if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(timeout)))
{
Expand Down Expand Up @@ -1603,7 +1603,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
}
_ret = UMQTT_OK;

if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(timeout)))
{
Expand Down Expand Up @@ -1718,7 +1718,7 @@ int umqtt_subscribe(struct umqtt_client *client, const char *topic, enum umqtt_q
set_uplink_recon_tick(client, UPLINK_LAST_TICK);

rt_memset(&msg_ack, 0, sizeof(msg_ack));
if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
{
Expand Down Expand Up @@ -1817,7 +1817,7 @@ int umqtt_unsubscribe(struct umqtt_client *client, const char *topic)
set_uplink_recon_tick(client, UPLINK_LAST_TICK);

rt_memset(&msg_ack, 0, sizeof(msg_ack));
if (RT_EOK == rt_mq_recv(client->msg_queue,
if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
{
Expand Down