mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
rename timedate-sntp to timesync
This commit is contained in:
Kay Sievers
3
.gitignore
vendored
3
.gitignore
vendored
@@ -101,6 +101,7 @@
|
||||
/systemd-sysctl
|
||||
/systemd-system-update-generator
|
||||
/systemd-timedated
|
||||
/systemd-timesyncd
|
||||
/systemd-tmpfiles
|
||||
/systemd-tty-ask-password-agent
|
||||
/systemd-uaccess
|
||||
@@ -149,6 +150,7 @@
|
||||
/test-inhibit
|
||||
/test-install
|
||||
/test-ipcrm
|
||||
/test-ipv4ll
|
||||
/test-job-type
|
||||
/test-journal
|
||||
/test-journal-enum
|
||||
@@ -188,7 +190,6 @@
|
||||
/test-tables
|
||||
/test-rtnl-manual
|
||||
/test-time
|
||||
/test-timedate-sntp
|
||||
/test-tmpfiles
|
||||
/test-udev
|
||||
/test-unit-file
|
||||
|
||||
42
Makefile.am
42
Makefile.am
@@ -187,6 +187,7 @@ AM_CPPFLAGS = \
|
||||
-I $(top_srcdir)/src/login \
|
||||
-I $(top_srcdir)/src/journal \
|
||||
-I $(top_srcdir)/src/timedate \
|
||||
-I $(top_srcdir)/src/timesync \
|
||||
-I $(top_srcdir)/src/systemd \
|
||||
-I $(top_builddir)/src/core \
|
||||
-I $(top_srcdir)/src/core \
|
||||
@@ -3952,24 +3953,13 @@ EXTRA_DIST += \
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
if ENABLE_TIMEDATED
|
||||
libsystemd_timedated_core_la_SOURCES = \
|
||||
src/timedate/timedate-sntp.c \
|
||||
src/timedate/timedate-sntp.h
|
||||
|
||||
libsystemd_timedated_core_la_LIBADD = \
|
||||
libsystemd-label.la \
|
||||
libsystemd-internal.la \
|
||||
libsystemd-shared.la \
|
||||
-lm
|
||||
|
||||
noinst_LTLIBRARIES += \
|
||||
libsystemd-timedated-core.la
|
||||
|
||||
systemd_timedated_SOURCES = \
|
||||
src/timedate/timedated.c
|
||||
|
||||
systemd_timedated_LDADD = \
|
||||
libsystemd-timedated-core.la
|
||||
libsystemd-label.la \
|
||||
libsystemd-internal.la \
|
||||
libsystemd-shared.la
|
||||
|
||||
rootlibexec_PROGRAMS += \
|
||||
systemd-timedated
|
||||
@@ -4014,15 +4004,6 @@ dist_bashcompletion_DATA += \
|
||||
|
||||
dist_zshcompletion_DATA += \
|
||||
shell-completion/zsh/_timedatectl
|
||||
|
||||
test_timedate_sntp_SOURCES = \
|
||||
src/timedate/test-timedate-sntp.c
|
||||
|
||||
test_timedate_sntp_LDADD = \
|
||||
libsystemd-timedated-core.la
|
||||
|
||||
manual_tests += \
|
||||
test-timedate-sntp
|
||||
endif
|
||||
|
||||
polkitpolicy_in_files += \
|
||||
@@ -4031,6 +4012,21 @@ polkitpolicy_in_files += \
|
||||
EXTRA_DIST += \
|
||||
units/systemd-timedated.service.in
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
if ENABLE_TIMESYNCD
|
||||
systemd_timesyncd_SOURCES = \
|
||||
src/timesync/timesyncd.c
|
||||
|
||||
systemd_timesyncd_LDADD = \
|
||||
libsystemd-label.la \
|
||||
libsystemd-internal.la \
|
||||
libsystemd-shared.la \
|
||||
-lm
|
||||
|
||||
noinst_PROGRAMS += \
|
||||
systemd-timesyncd
|
||||
endif
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
if HAVE_MYHOSTNAME
|
||||
libnss_myhostname_la_SOURCES = \
|
||||
|
||||
@@ -819,6 +819,14 @@ if test "x$enable_timedated" != "xno"; then
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
have_timesyncd=no
|
||||
AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable timesync daemon]))
|
||||
if test "x$enable_timesyncd" != "xno"; then
|
||||
have_timesyncd=yes
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"])
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
have_localed=no
|
||||
AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon]))
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2014 Kay Sievers
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/ip.h>
|
||||
#include <sys/timex.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "sd-event.h"
|
||||
#include "util.h"
|
||||
#include "log.h"
|
||||
#include "timedate-sntp.h"
|
||||
|
||||
typedef struct Manager Manager;
|
||||
struct Manager {
|
||||
sd_event *event;
|
||||
SNTPContext *sntp;
|
||||
};
|
||||
|
||||
static void manager_free(Manager *m);
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
|
||||
#define _cleanup_manager_free_ _cleanup_(manager_freep)
|
||||
|
||||
static int manager_new(Manager **ret) {
|
||||
_cleanup_manager_free_ Manager *m = NULL;
|
||||
int r;
|
||||
|
||||
m = new0(Manager, 1);
|
||||
if (!m)
|
||||
return -ENOMEM;
|
||||
|
||||
r = sd_event_default(&m->event);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
*ret = m;
|
||||
m = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void manager_free(Manager *m) {
|
||||
|
||||
if (!m)
|
||||
return;
|
||||
|
||||
m->sntp = sntp_unref(m->sntp);
|
||||
sd_event_unref(m->event);
|
||||
free(m);
|
||||
}
|
||||
|
||||
static void manager_report(usec_t poll_usec, double offset, double delay, double jitter, bool spike) {
|
||||
log_info("%4llu %+10f %10f %10f%s",
|
||||
poll_usec / USEC_PER_SEC, offset, delay, jitter, spike ? " spike" : "");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
_cleanup_manager_free_ Manager *m = NULL;
|
||||
const char *server;
|
||||
int r;
|
||||
|
||||
r = manager_new(&m);
|
||||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
r = sntp_new(&m->sntp, m->event);
|
||||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
if (argv[1])
|
||||
log_set_max_level(LOG_DEBUG);
|
||||
else
|
||||
sntp_report_register(m->sntp, manager_report);
|
||||
|
||||
//server = "216.239.32.15"; /* time1.google.com */
|
||||
//server = "192.53.103.108"; /* ntp1.ptb.de */
|
||||
server = "27.54.95.11"; /* au.pool.ntp.org */
|
||||
r = sntp_server_connect(m->sntp, server);
|
||||
|
||||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
r = sd_event_loop(m->event);
|
||||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
out:
|
||||
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2014 Kay Sievers
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "util.h"
|
||||
#include "sd-event.h"
|
||||
|
||||
typedef struct SNTPContext SNTPContext;
|
||||
struct SNTPContext;
|
||||
|
||||
int sntp_new(SNTPContext **sntp, sd_event *e);
|
||||
SNTPContext *sntp_unref(SNTPContext *sntp);
|
||||
int sntp_server_connect(SNTPContext *sntp, const char *server);
|
||||
void sntp_server_disconnect(SNTPContext *sntp);
|
||||
void sntp_report_register(SNTPContext *sntp, void (*report)(usec_t poll_usec, double offset, double delay, double jitter, bool spike));
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user