Skip to content

修改一些错误,rt_mq_recv应当是 #22

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
ztlchina wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修改一些错误,rt_mq_recv应当是 #22

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/trans/umqtt_transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ int umqtt_trans_connect(const char *uri, int *sock)
goto exit;
}

_ret = ioctlsocket(*sock, FIONBIO, 0);
_ret = ioctl(*sock, FIONBIO, 0);
if (_ret < 0)
{
LOG_E(" iocontrol socket error!");
Expand Down
24 changes: 12 additions & 12 deletions src/umqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ static void umqtt_deliver_message(struct umqtt_client *client,
{
p_subtop->callback(client, msg);
}
}
}
}
}

static int umqtt_readpacket(struct umqtt_client *client, unsigned char *buf, int len, int timeout)
Expand Down Expand Up @@ -885,7 +885,7 @@ static int umqtt_handle_readpacket(struct umqtt_client *client)

_ret = rt_mq_send(client->msg_queue, &msg_ack, sizeof(struct umqtt_msg_ack));
if (_ret != RT_EOK)
{
{
_ret = UMQTT_SEND_FAILED;
goto exit;
}
Expand Down 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 @@ -1717,10 +1717,10 @@ 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,
&msg_ack, sizeof(struct umqtt_msg_ack),
rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
rt_memset(&msg_ack, 0, sizeof(msg_ack));
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)))
{
if (msg_ack.msg_type == UMQTT_TYPE_SUBACK)
{
Expand Down Expand Up @@ -1816,8 +1816,8 @@ 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,
rt_memset(&msg_ack, 0, sizeof(msg_ack));
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