*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <glib.h>
-#include <gweb/gresolv.h>
-
#include "connman.h"
struct ntp_short {
#define LOGTOD(a) ((a) < 0 ? 1. / (1L << -(a)) : 1L << (int)(a))
+static guint channel_watch = 0;
static struct timeval transmit_timeval;
-static char *transmit_server;
-static int transmit_fd;
-static guint transmit_delay = 16;
+static int transmit_fd = 0;
+
+static char *timeserver = NULL;
+static gint poll_id = 0;
+static gint timeout_id = 0;
static void send_packet(int fd, const char *server)
{
}
}
-static gboolean next_request(gpointer user_data)
+static gboolean next_server(gpointer user_data)
+{
+ if (timeserver != NULL) {
+ g_free(timeserver);
+ timeserver = NULL;
+ }
+
+ __connman_timeserver_sync_next();
+
+ return FALSE;
+}
+
+static gboolean next_poll(gpointer user_data)
{
- DBG("server %s", transmit_server);
+ if (timeserver == NULL || transmit_fd == 0)
+ return FALSE;
- send_packet(transmit_fd, transmit_server);
+ send_packet(transmit_fd, timeserver);
return FALSE;
}
struct ntp_msg *msg = base;
double org, rec, xmt, dst;
double delay, offset;
+ static guint transmit_delay;
if (len < sizeof(*msg)) {
connman_error("Invalid response from time server");
DBG("offset=%f delay=%f", offset, delay);
+ /* Remove the timeout, as timeserver has responded */
+ if (timeout_id > 0)
+ g_source_remove(timeout_id);
+
+ /*
+ * Now poll the server every transmit_delay seconds
+ * for time correction.
+ */
+ if (poll_id > 0)
+ g_source_remove(poll_id);
+
+ DBG("Timeserver %s, next sync in %d seconds", timeserver, transmit_delay);
+
+ poll_id = g_timeout_add_seconds(transmit_delay, next_poll, NULL);
+
+ connman_info("ntp: time slew %+.6f s", offset);
+
if (offset < STEPTIME_MIN_OFFSET && offset > -STEPTIME_MIN_OFFSET) {
struct timeval adj;
}
}
-static guint channel_watch = 0;
-
static gboolean received_data(GIOChannel *channel, GIOCondition condition,
gpointer user_data)
{
decode_msg(iov.iov_base, iov.iov_len, tv);
- g_timeout_add_seconds(transmit_delay, next_request, NULL);
-
return TRUE;
}
-static void start_ntp(const char *server)
+static void start_ntp(char *server)
{
GIOChannel *channel;
struct sockaddr_in addr;
- int fd, tos = IPTOS_LOWDELAY, timestamp = 1;
+ int tos = IPTOS_LOWDELAY, timestamp = 1;
+
+ if (server == NULL)
+ return;
DBG("server %s", server);
if (channel_watch > 0)
- return;
+ goto send;
- fd = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- if (fd < 0) {
+ transmit_fd = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+ if (transmit_fd < 0) {
connman_error("Failed to open time server socket");
return;
}
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
- if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ if (bind(transmit_fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
connman_error("Failed to bind time server socket");
- close(fd);
+ close(transmit_fd);
return;
}
- if (setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) {
+ if (setsockopt(transmit_fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) {
connman_error("Failed to set type of service option");
- close(fd);
+ close(transmit_fd);
return;
}
- if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMP, ×tamp,
+ if (setsockopt(transmit_fd, SOL_SOCKET, SO_TIMESTAMP, ×tamp,
sizeof(timestamp)) < 0) {
connman_error("Failed to enable timestamp support");
- close(fd);
+ close(transmit_fd);
return;
}
- channel = g_io_channel_unix_new(fd);
+ channel = g_io_channel_unix_new(transmit_fd);
if (channel == NULL) {
- close(fd);
+ close(transmit_fd);
return;
}
g_io_channel_unref(channel);
- transmit_fd = fd;
- transmit_server = g_strdup(server);
-
- send_packet(fd, server);
+send:
+ send_packet(transmit_fd, server);
}
-static void resolv_debug(const char *str, void *data)
+int __connman_ntp_start(char *server)
{
- connman_info("%s: %s\n", (const char *) data, str);
-}
+ DBG("%s", server);
-static GResolv *resolv = NULL;
-static guint resolv_lookup = 0;
+ if (server == NULL)
+ return -EINVAL;
-static void resolv_result(GResolvResultStatus status,
- char **results, gpointer user_data)
-{
- int i;
+ if (timeserver != NULL)
+ g_free(timeserver);
- resolv_lookup = 0;
+ timeserver = g_strdup(server);
- if (results != NULL) {
- for (i = 0; results[i]; i++)
- DBG("result: %s", results[i]);
+ start_ntp(timeserver);
- if (results[0] != NULL)
- start_ntp(results[0]);
- }
-}
+ /*
+ * Add a fallback timeout , preferably short, 5 sec here,
+ * to fallback on the next server.
+ */
-int __connman_ntp_start(const char *interface, const char *resolver,
- const char *server)
-{
- DBG("interface %s server %s", interface, server);
-
- resolv = g_resolv_new(0);
- if (resolv == NULL)
- return -ENOMEM;
-
- if (getenv("CONNMAN_RESOLV_DEBUG"))
- g_resolv_set_debug(resolv, resolv_debug, "RESOLV");
-
- if (resolver != NULL)
- g_resolv_add_nameserver(resolv, resolver, 53, 0);
-
- g_resolv_lookup_hostname(resolv, server, resolv_result, NULL);
+ timeout_id = g_timeout_add_seconds(5, next_server, NULL);
return 0;
}
-void __connman_ntp_stop(const char *interface)
+void __connman_ntp_stop()
{
- DBG("interface %s", interface);
+ DBG("");
- if (resolv == NULL)
- return;
+ if (poll_id > 0)
+ g_source_remove(poll_id);
- if (resolv_lookup > 0) {
- g_resolv_cancel_lookup(resolv, resolv_lookup);
- resolv_lookup = 0;
- }
+ if (timeout_id > 0)
+ g_source_remove(timeout_id);
if (channel_watch > 0) {
g_source_remove(channel_watch);
channel_watch = 0;
+ transmit_fd = 0;
}
- g_resolv_unref(resolv);
+ if (timeserver != NULL) {
+ g_free(timeserver);
+ timeserver = NULL;
+ }
}
projects / framework / connectivity / connman.git / blobdiff