michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: net: google_iot_mqtt: use sntp_simple

Browse source 
Simplify overall scenario using sntp_simple to keep main MQTT logic more
clear. Also, remove related code which was used only by the old SNTP
code, e.g. show_addrinfo().

Signed-off-by: Alexey Markevich <buhhunyx@gmail.com>
This commit is contained in:
Alexey Markevich 2020-06-19 21:43:05 +03:00 • committed by Jukka Rissanen
commit 079f158451
1 changed files with 5 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

77
samples/net/cloud/google_iot_mqtt/src/main.c
View file

@ -26,27 +26,17 @@ LOG_MODULE_REGISTER(net_google_iot_mqtt, LOG_LEVEL_INF);
int64_t time_base; int64_t time_base;
void do_sntp(struct addrinfo *addr) int do_sntp(void)
{ {
struct sntp_ctx ctx;
int rc; int rc;
int64_t stamp;
struct sntp_time sntp_time; struct sntp_time sntp_time;
char time_str[sizeof("1970-01-01T00:00:00")]; char time_str[sizeof("1970-01-01T00:00:00")];
LOG_INF("Sending NTP request for current time:"); LOG_INF("Sending NTP request for current time:");
/* Initialize sntp */ rc = sntp_simple("time.google.com", SYS_FOREVER_MS, &sntp_time);
rc = sntp_init(&ctx, addr->ai_addr, sizeof(struct sockaddr_in));
if (rc < 0) {
LOG_ERR("Unable to init sntp context: %d", rc);
return;
}
rc = sntp_query(&ctx, SYS_FOREVER_MS, &sntp_time);
if (rc == 0) { if (rc == 0) {
stamp = k_uptime_get(); time_base = sntp_time.seconds * MSEC_PER_SEC - k_uptime_get();
time_base = sntp_time.seconds * MSEC_PER_SEC - stamp;
/* Convert time to make sure. */ /* Convert time to make sure. */
time_t now = sntp_time.seconds; time_t now = sntp_time.seconds;
@ -59,8 +49,7 @@ void do_sntp(struct addrinfo *addr)
} else { } else {
LOG_ERR(" Failed to acquire SNTP, code %d\n", rc); LOG_ERR(" Failed to acquire SNTP, code %d\n", rc);
} }
return rc;
sntp_close(&ctx);
} }
/* /*
@ -68,35 +57,6 @@ void do_sntp(struct addrinfo *addr)
*/ */
#define MBEDTLS_NETWORK_TIMEOUT 30000 #define MBEDTLS_NETWORK_TIMEOUT 30000
static void show_addrinfo(struct addrinfo *addr)
{
char hr_addr[NET_IPV6_ADDR_LEN];
void *a;
top:
LOG_DBG(" flags : %d", addr->ai_flags);
LOG_DBG(" family : %d", addr->ai_family);
LOG_DBG(" socktype: %d", addr->ai_socktype);
LOG_DBG(" protocol: %d", addr->ai_protocol);
LOG_DBG(" addrlen : %d", (int)addr->ai_addrlen);
/* Assume two words. */
LOG_DBG(" addr[0]: 0x%x", ((uint32_t *)addr->ai_addr)[0]);
LOG_DBG(" addr[1]: 0x%x", ((uint32_t *)addr->ai_addr)[1]);
if (addr->ai_next != 0) {
addr = addr->ai_next;
goto top;
}
a = &net_sin(addr->ai_addr)->sin_addr;
LOG_INF(" Got %s",
log_strdup(net_addr_ntop(addr->ai_family, a,
hr_addr, sizeof(hr_addr))));
}
/* /*
* Things that make sense in a demo app that would need to be more * Things that make sense in a demo app that would need to be more
* robust in a real application: * robust in a real application:
@ -107,11 +67,7 @@ top:
*/ */
void main(void) void main(void)
{ {
char time_ip[NET_IPV6_ADDR_LEN];
static struct addrinfo hints;
struct addrinfo *haddr;
int res; int res;
int cnt = 0;
LOG_INF("Main entered"); LOG_INF("Main entered");
@ -119,31 +75,8 @@ void main(void)
LOG_INF("Should have DHCPv4 lease at this point."); LOG_INF("Should have DHCPv4 lease at this point.");
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = 0;
while ((res = getaddrinfo("time.google.com", "123", &hints,
&haddr)) && cnt < 3) {
LOG_ERR("Unable to get address for NTP server, retrying");
cnt++;
}
if (res != 0) {
LOG_ERR("Unable to get address of NTP server, exiting %d", res);
return;
}
LOG_INF("DNS resolved for time.google.com:123");
time_base = 0;
inet_ntop(AF_INET, &net_sin(haddr->ai_addr)->sin_addr, time_ip,
haddr->ai_addrlen);
show_addrinfo(haddr);
do_sntp(haddr);
freeaddrinfo(haddr);
/* early return if we failed to acquire time */ /* early return if we failed to acquire time */
if (time_base == 0) { if (do_sntp() != 0) {
LOG_ERR("Failed to get NTP time"); LOG_ERR("Failed to get NTP time");
return; return;
} }