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

Fix SNTP so that it retries DNS lookups if it needs to (#2283)

This commit is contained in:
Philip Gladstone 2018-03-01 17:57:55 -05:00 committed by Marcel Stör
parent 4a47382e0f
commit f2d605d27c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/modules/sntp.c
View File

@ -132,6 +132,7 @@ typedef struct
typedef struct { typedef struct {
int32_t sync_cb_ref; int32_t sync_cb_ref;
int32_t err_cb_ref; int32_t err_cb_ref;
int32_t list_ref;
os_timer_t timer; os_timer_t timer;
} sntp_repeat_t; } sntp_repeat_t;
@ -225,6 +226,9 @@ static void sntp_handle_result(lua_State *L) {
const uint32_t MICROSECONDS = 1000000; const uint32_t MICROSECONDS = 1000000;
if (state->best.stratum == 0) { if (state->best.stratum == 0) {
// This could be because none of the servers are reachable, or maybe we haven't been able to look
// them up.
server_count = 0; // Reset for next time.
handle_error(L, NTP_TIMEOUT_ERR, NULL); handle_error(L, NTP_TIMEOUT_ERR, NULL);
return; return;
} }
@ -614,10 +618,11 @@ static int sntp_getoffset(lua_State *L)
static void sntp_dolookups (lua_State *L) { static void sntp_dolookups (lua_State *L) {
// Step through each element of the table, converting it to an address // Step through each element of the table, converting it to an address
// at the end, start the lookups // at the end, start the lookups. If we have already looked everything up,
// // then move straight to sending the packets.
if (state->list_ref == LUA_NOREF) { if (state->list_ref == LUA_NOREF) {
sntp_dosend(L); sntp_dosend(L);
return;
} }
lua_rawgeti(L, LUA_REGISTRYINDEX, state->list_ref); lua_rawgeti(L, LUA_REGISTRYINDEX, state->list_ref);
@ -692,6 +697,8 @@ static char *set_repeat_mode(lua_State *L, bool enable)
repeat->sync_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); repeat->sync_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lua_rawgeti(L, LUA_REGISTRYINDEX, state->err_cb_ref); lua_rawgeti(L, LUA_REGISTRYINDEX, state->err_cb_ref);
repeat->err_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); repeat->err_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lua_rawgeti(L, LUA_REGISTRYINDEX, state->list_ref);
repeat->list_ref = luaL_ref(L, LUA_REGISTRYINDEX);
os_timer_setfn(&repeat->timer, on_long_timeout, NULL); os_timer_setfn(&repeat->timer, on_long_timeout, NULL);
os_timer_arm(&repeat->timer, 1000 * 1000, 1); os_timer_arm(&repeat->timer, 1000 * 1000, 1);
} else { } else {
@ -699,6 +706,7 @@ static char *set_repeat_mode(lua_State *L, bool enable)
os_timer_disarm (&repeat->timer); os_timer_disarm (&repeat->timer);
luaL_unref (L, LUA_REGISTRYINDEX, repeat->sync_cb_ref); luaL_unref (L, LUA_REGISTRYINDEX, repeat->sync_cb_ref);
luaL_unref (L, LUA_REGISTRYINDEX, repeat->err_cb_ref); luaL_unref (L, LUA_REGISTRYINDEX, repeat->err_cb_ref);
luaL_unref (L, LUA_REGISTRYINDEX, repeat->list_ref);
c_free(repeat); c_free(repeat);
repeat = NULL; repeat = NULL;
} }
@ -718,8 +726,12 @@ static void on_long_timeout (void *arg)
state->sync_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); state->sync_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lua_rawgeti(L, LUA_REGISTRYINDEX, repeat->err_cb_ref); lua_rawgeti(L, LUA_REGISTRYINDEX, repeat->err_cb_ref);
state->err_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); state->err_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
if (server_count == 0) {
lua_rawgeti(L, LUA_REGISTRYINDEX, repeat->list_ref);
state->list_ref = luaL_ref(L, LUA_REGISTRYINDEX);
}
state->is_on_timeout = 1; state->is_on_timeout = 1;
sntp_dosend (L); sntp_dolookups(L);
} }
} }
} }