Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
b74a9dbd
Commit
b74a9dbd
authored
Nov 08, 2016
by
Philip Gladstone
Committed by
Marcel Stör
Nov 08, 2016
Browse files
Make the MQTT PING functionality work better. (#1557)
Deal with flow control stopped case
parent
73773fd8
Changes
1
Show whitespace changes
Inline
Side-by-side
app/modules/mqtt.c
View file @
b74a9dbd
...
...
@@ -72,6 +72,7 @@ typedef struct lmqtt_userdata
uint8_t
secure
;
#endif
bool
connected
;
// indicate socket connected, not mqtt prot connected.
bool
keepalive_sent
;
ETSTimer
mqttTimer
;
tConnState
connState
;
}
lmqtt_userdata
;
...
...
@@ -454,6 +455,7 @@ READPACKET:
break
;
case
MQTT_MSG_TYPE_PINGRESP
:
// Ignore
mud
->
keepalive_sent
=
0
;
NODE_DBG
(
"MQTT: PINGRESP received
\r\n
"
);
break
;
}
...
...
@@ -640,16 +642,23 @@ void mqtt_socket_timer(void *arg)
// no queued event.
mud
->
keep_alive_tick
++
;
if
(
mud
->
keep_alive_tick
>
mud
->
mqtt_state
.
connect_info
->
keepalive
){
if
(
mud
->
keepalive_sent
)
{
// Oh dear -- keepalive timer expired and still no ack of previous message
mqtt_socket_reconnected
(
mud
->
pesp_conn
,
0
);
}
else
{
uint8_t
temp_buffer
[
MQTT_BUF_SIZE
];
mqtt_msg_init
(
&
mud
->
mqtt_state
.
mqtt_connection
,
temp_buffer
,
MQTT_BUF_SIZE
);
NODE_DBG
(
"
\r\n
MQTT: Send keepalive packet
\r\n
"
);
mqtt_message_t
*
temp_msg
=
mqtt_msg_pingreq
(
&
mud
->
mqtt_state
.
mqtt_connection
);
msg_queue_t
*
node
=
msg_enqueue
(
&
(
mud
->
mqtt_state
.
pending_msg_q
),
temp_msg
,
0
,
MQTT_MSG_TYPE_PINGREQ
,
(
int
)
mqtt_get_qos
(
temp_msg
->
data
)
);
mud
->
keepalive_sent
=
1
;
mud
->
keep_alive_tick
=
0
;
// Need to reset to zero in case flow control stopped.
mqtt_send_if_possible
(
mud
->
pesp_conn
);
}
}
}
}
NODE_DBG
(
"keep_alive_tick: %d
\n
"
,
mud
->
keep_alive_tick
);
NODE_DBG
(
"leave mqtt_socket_timer.
\n
"
);
}
...
...
@@ -675,6 +684,7 @@ static int mqtt_socket_client( lua_State* L )
// create a object
mud
=
(
lmqtt_userdata
*
)
lua_newuserdata
(
L
,
sizeof
(
lmqtt_userdata
));
c_memset
(
mud
,
0
,
sizeof
(
*
mud
));
// pre-initialize it, in case of errors
mud
->
self_ref
=
LUA_NOREF
;
mud
->
cb_connect_ref
=
LUA_NOREF
;
...
...
@@ -685,18 +695,8 @@ static int mqtt_socket_client( lua_State* L )
mud
->
cb_suback_ref
=
LUA_NOREF
;
mud
->
cb_unsuback_ref
=
LUA_NOREF
;
mud
->
cb_puback_ref
=
LUA_NOREF
;
mud
->
pesp_conn
=
NULL
;
#ifdef CLIENT_SSL_ENABLE
mud
->
secure
=
0
;
#endif
mud
->
keep_alive_tick
=
0
;
mud
->
event_timeout
=
0
;
mud
->
connState
=
MQTT_INIT
;
mud
->
connected
=
false
;
c_memset
(
&
mud
->
mqttTimer
,
0
,
sizeof
(
ETSTimer
));
c_memset
(
&
mud
->
mqtt_state
,
0
,
sizeof
(
mqtt_state_t
));
c_memset
(
&
mud
->
connect_info
,
0
,
sizeof
(
mqtt_connect_info_t
));
// set its metatable
luaL_getmetatable
(
L
,
"mqtt.socket"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment