diff options
| -rw-r--r-- | Makefile.plugins | 13 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | plugins/ntpd.c | 325 |
3 files changed, 0 insertions, 356 deletions
diff --git a/Makefile.plugins b/Makefile.plugins index 58b04944..13715187 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -285,19 +285,6 @@ script_PROGRAMS += scripts/openvpn-script scripts_openvpn_script_LDADD = @DBUS_LIBS@ endif -if NTPD -if NTPD_BUILTIN -builtin_modules += ntpd -builtin_sources += plugins/ntpd.c -builtin_cflags += -DNTPD=\"@NTPD@\" -else -plugin_LTLIBRARIES += plugins/ntpd.la -plugin_objects += $(plugins_ntpd_la_OBJECTS) -plugins_ntpd_la_CFLAGS = $(plugin_cflags) -DNTPD=\"@NTPD@\" -plugins_ntpd_la_LDFLAGS = $(plugin_ldflags) -endif -endif - if NMCOMPAT if NMCOMPAT_BUILTIN builtin_modules += nmcompat diff --git a/configure.ac b/configure.ac index f63fea8b..3dca02e7 100644 --- a/configure.ac +++ b/configure.ac @@ -306,24 +306,6 @@ AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm], [enable Intel OSPM support]), [enable_iospm=${enableval}]) AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes") -AC_ARG_WITH(ntpd, AC_HELP_STRING([--with-ntpd=PROGRAM], - [specify ntpd binary location]), [path_ntpd=${withval}]) - -AC_ARG_ENABLE(ntpd, - AC_HELP_STRING([--enable-ntpd], [enable ntpd support]), - [enable_ntpd=${enableval}], [enable_ntpd="no"]) - -if (test "${enable_ntpd}" != "no"); then - if (test -z "${path_ntpd}"); then - AC_PATH_PROG(NTPD, [ntpd], [], $PATH:/sbin:/usr/sbin) - else - NTPD="${path_ntpd}" - AC_SUBST(NTPD) - fi -fi -AM_CONDITIONAL(NTPD, test "${enable_ntpd}" != "no") -AM_CONDITIONAL(NTPD_BUILTIN, test "${enable_ntpd}" = "builtin") - AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat], [enable nmcompat support]), [enable_nmcompat=${enableval}], [enable_nmcompat="no"]) diff --git a/plugins/ntpd.c b/plugins/ntpd.c deleted file mode 100644 index 19e9828f..00000000 --- a/plugins/ntpd.c +++ /dev/null @@ -1,325 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2010 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 - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <errno.h> -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <arpa/inet.h> - -#include <gdbus.h> - -#define CONNMAN_API_SUBJECT_TO_CHANGE -#include <connman/types.h> -#include <connman/plugin.h> -#include <connman/task.h> -#include <connman/timeserver.h> -#include <connman/log.h> - -/* - * The peers list are the peers currently added to a running ntpd, - * while pending_peers are the one appended but not used by ntpd yet. - */ -static GList *peers = NULL; -static GList *pending_peers = NULL; - -#define NTPD_PORT 123 - -struct ntpd_peer { - char *server; - int refcount; -}; - -struct ntpdate_task { - struct connman_task *task; - gint conf_fd; - char *conf_path; -}; - -static struct ntpd_peer *find_peer(GList *peer_list, const char* server) -{ - GList *list; - struct ntpd_peer *peer; - - for (list = peer_list; list; list = list->next) { - peer = list->data; - - if (g_str_equal(peer->server, server)) - return peer; - } - - return NULL; -} - -static void remove_peer(GList *peer_list, struct ntpd_peer *peer) -{ - if (__sync_fetch_and_sub(&peer->refcount, 1) != 1) - return; - - g_free(peer->server); - g_free(peer); - peer_list = g_list_remove(peer_list, peer); -} - -static connman_bool_t ntpd_running(void) -{ - int sock; - connman_bool_t ret; - struct sockaddr_in server_addr; - - if ((sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0)) == -1) - return FALSE; - - server_addr.sin_family = AF_INET; - server_addr.sin_port = htons(NTPD_PORT); - server_addr.sin_addr.s_addr = INADDR_ANY; - memset(&(server_addr.sin_zero), 0, 8); - - if (bind(sock, (struct sockaddr *)&server_addr, - sizeof(struct sockaddr)) == -1) { - if (errno == EADDRINUSE) - ret = TRUE; - else - ret = FALSE; - } else - ret = FALSE; - - close(sock); - - return ret; -} - -static void ntpdate_died(struct connman_task *task, - int exit_code, void *user_data) -{ - struct ntpdate_task *ntpdate = user_data; - - DBG(""); - - unlink(ntpdate->conf_path); - g_free(ntpdate->conf_path); - connman_task_destroy(ntpdate->task); -} - -static void ntpdate_add_peer(struct ntpdate_task *ntpdate, char *peer) -{ - FILE *conf_file; - - DBG("%s", peer); - - conf_file = fdopen(ntpdate->conf_fd, "a+"); - if (conf_file == NULL) { - connman_error("fdopen failed"); - return; - } - - fprintf(conf_file, "server %s iburst\n", peer); - - fclose(conf_file); -} - -static int ntpdate(void) -{ - int err; - GError *g_err; - GList *list; - struct ntpd_peer *peer; - struct ntpdate_task *ntpdate; - - DBG(""); - - ntpdate = g_try_new0(struct ntpdate_task, 1); - if (ntpdate == NULL) - return -ENOMEM; - - /* ntpdate is deprecated, we use ntpd -q instead */ - ntpdate->task = connman_task_create(NTPD); - if (ntpdate->task == NULL) { - err = -ENOMEM; - goto error_task; - } - - connman_task_add_argument(ntpdate->task, "-g", NULL); - connman_task_add_argument(ntpdate->task, "-q", NULL); - - /* The servers are added through a temp configuration file */ - ntpdate->conf_fd = g_file_open_tmp("connman.ntp.conf_XXXXXX", - &ntpdate->conf_path, &g_err); - if (ntpdate->conf_fd == -1) { - err = g_err->code; - g_free(g_err); - goto error_open; - } - - connman_task_add_argument(ntpdate->task, "-c", ntpdate->conf_path); - - DBG("conf path %s", ntpdate->conf_path); - - for (list = pending_peers; list; list = list->next) { - peer = list->data; - - ntpdate_add_peer(ntpdate, peer->server); - } - - for (list = peers; list; list = list->next) { - peer = list->data; - - ntpdate_add_peer(ntpdate, peer->server); - } - - close(ntpdate->conf_fd); - - return connman_task_run(ntpdate->task, ntpdate_died, ntpdate, - NULL, NULL, NULL); -error_open: - connman_task_destroy(ntpdate->task); - -error_task: - g_free(ntpdate); - - return err; -} - -static int ntpd_add_peer(char *peer) -{ - DBG("%s", peer); - - return 0; -} - -static void ntpd_sync(void) -{ - int err; - GList *list; - - DBG(""); - - if (g_list_length(pending_peers) == 0 && - g_list_length(peers) == 0) - return; - - if (!ntpd_running()) { - ntpdate(); - return; - } - - /* TODO Grab ntp keys path */ - - list = g_list_first(pending_peers); - while(list) { - struct ntpd_peer *peer = list->data; - - err = ntpd_add_peer(peer->server); - if (err) - continue; - - peers = g_list_prepend(peers, peer); - - list = g_list_next(list); - - pending_peers = g_list_remove(pending_peers, peer); - }; -} - -static int ntpd_append(const char *server) -{ - struct ntpd_peer *peer; - - DBG(""); - - if (server == NULL) - return 0; - - if ((peer = find_peer(pending_peers, server)) || - (peer = find_peer(peers, server))) { - __sync_fetch_and_add(&peer->refcount, 1); - return 0; - } - - peer = g_try_new0(struct ntpd_peer, 1); - if (peer == NULL) - return -ENOMEM; - - peer->server = g_strdup(server); - if (peer->server == NULL) { - g_free(peer); - return -ENOMEM; - } - - peer->refcount = 1; - - pending_peers = g_list_prepend(pending_peers, peer); - - return 0; -} - -static int ntpd_remove(const char *server) -{ - struct ntpd_peer *peer; - - DBG(""); - - if (server == NULL) - return 0; - - peer = find_peer(peers, server); - if (peer == NULL) - goto remove; - - remove_peer(peers, peer); - -remove: - /* TODO: send ntpd remove command */ - - peer = find_peer(pending_peers, server); - if (peer == NULL) - return 0; - - remove_peer(pending_peers, peer); - - return 0; -} - -static struct connman_timeserver_driver ntpd_driver = { - .name = "ntpd", - .priority = CONNMAN_TIMESERVER_PRIORITY_DEFAULT, - .append = ntpd_append, - .remove = ntpd_remove, - .sync = ntpd_sync, -}; - -static int ntpd_init(void) -{ - return connman_timeserver_driver_register(&ntpd_driver); -} - -static void ntpd_exit(void) -{ - connman_timeserver_driver_unregister(&ntpd_driver); -} - -CONNMAN_PLUGIN_DEFINE(ntpd, "ntpd plugin", VERSION, - CONNMAN_PLUGIN_PRIORITY_DEFAULT, ntpd_init, ntpd_exit) |