MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #636 from karrots/mqtt-clean-session 

Added mqtt clean session support.
This commit is contained in:
Vowstar 2015-10-17 20:58:06 +08:00
parent a33e3a4a25 5161081c1c
commit 340ef8fc0a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/modules/mqtt.c
View File

@ -549,7 +549,7 @@ void mqtt_socket_timer(void *arg)
NODE_DBG("leave mqtt_socket_timer.\n");
}
// Lua: mqtt.Client(clientid, keepalive, user, pass)
// Lua: mqtt.Client(clientid, keepalive, user, pass, clean_session)
static int mqtt_socket_client( lua_State* L )
{
NODE_DBG("enter mqtt_socket_client.\n");
@ -566,6 +566,7 @@ static int mqtt_socket_client( lua_State* L )
int keepalive = 0;
int stack = 1;
unsigned secure = 0;
int clean_session = 1;
int top = lua_gettop(L);
// create a object
@ -627,6 +628,16 @@ static int mqtt_socket_client( lua_State* L )
if(password == NULL)
pwl = 0;
NODE_DBG("lengh password: %d\r\n", pwl);
if(lua_isnumber( L, stack ))
{
clean_session = luaL_checkinteger( L, stack);
stack++;
}
if(clean_session > 1){
clean_session = 1;
}
// TODO: check the zalloc result.
mud->connect_info.client_id = (uint8_t *)c_zalloc(idl+1);
@ -657,7 +668,7 @@ static int mqtt_socket_client( lua_State* L )
NODE_DBG("MQTT: Init info: %s, %s, %s\r\n", mud->connect_info.client_id, mud->connect_info.username, mud->connect_info.password);
mud->connect_info.clean_session = 1;
mud->connect_info.clean_session = clean_session;
mud->connect_info.will_qos = 0;
mud->connect_info.will_retain = 0;
mud->connect_info.keepalive = keepalive;