GitHub/nodemcu-firmware
1
0
Fork 0
mirror of https://github.com/nodemcu/nodemcu-firmware.git synced 2025-01-30 21:12:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #779 from askainet/sntp_dns

Browse Source 
Make sntp.sync work with DNS hostnames
This commit is contained in:
Johny Mattsson 2015-11-24 11:03:37 +11:00
commit 455f0f2166
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/modules/sntp.c
View File

@ -39,6 +39,7 @@
#include "lwip/udp.h" #include "lwip/udp.h"
#include "c_stdlib.h" #include "c_stdlib.h"
#include "user_modules.h" #include "user_modules.h"
#include "lwip/dns.h"
#ifdef LUA_USE_MODULES_RTCTIME #ifdef LUA_USE_MODULES_RTCTIME
#include "rtc/rtctime.h" #include "rtc/rtctime.h"
@ -148,6 +149,22 @@ static void sntp_dosend (lua_State *L)
} }
static void sntp_dns_found(const char *name, ip_addr_t *ipaddr, void *arg)
{
lua_State *L = arg;
if (ipaddr == NULL)
{
NODE_ERR("DNS Fail!\n");
handle_error(L);
}
else
{
server = *ipaddr;
sntp_dosend(L);
}
}
static void on_timeout (void *arg) static void on_timeout (void *arg)
{ {
sntp_dbg("sntp: timer\n"); sntp_dbg("sntp: timer\n");
@ -306,13 +323,6 @@ static int sntp_sync (lua_State *L)
udp_recv (state->pcb, on_recv, L); udp_recv (state->pcb, on_recv, L);
// use last server, unless new one specified
if (!lua_isnoneornil (L, 1))
{
if (!ipaddr_aton (luaL_checkstring (L, 1), &server))
sync_err ("bad IP address");
}
if (!lua_isnoneornil (L, 2)) if (!lua_isnoneornil (L, 2))
{ {
lua_pushvalue (L, 2); lua_pushvalue (L, 2);
@ -334,6 +344,21 @@ static int sntp_sync (lua_State *L)
os_timer_arm (&state->timer, 1000, 1); os_timer_arm (&state->timer, 1000, 1);
state->attempts = 0; state->attempts = 0;
// use last server, unless new one specified
if (!lua_isnoneornil (L, 1))
{
size_t l;
const char *hostname = luaL_checklstring(L, 1, &l);
if (l>128 || hostname == NULL)
sync_err("need <128 hostname");
err_t err = dns_gethostbyname(hostname, &server, sntp_dns_found, &L);
if (err == ERR_INPROGRESS)
return 0; // Callback function sntp_dns_found will handle sntp_dosend for us
else if (err == ERR_ARG)
sync_err("bad hostname");
}
sntp_dosend (L); sntp_dosend (L);
return 0; return 0;