X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftimesync%2Ftimesyncd-manager.c;h=ef5854d07ebaa3dcc9af20cf2652ad07d2f4ae6d;hb=230314d718cb68b328961c9723976e54c17d06f7;hp=b16b25a96ad2dc552d448fbfe3b0d2769d3c772b;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index b16b25a96..ef5854d07 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -133,6 +133,7 @@ struct ntp_msg {
 static int manager_arm_timer(Manager *m, usec_t next);
 static int manager_clock_watch_setup(Manager *m);
 static int manager_listen_setup(Manager *m);
+static void manager_listen_stop(Manager *m);
 
 static double ntp_ts_short_to_d(const struct ntp_ts_short *ts) {
         return be16toh(ts->sec) + (be16toh(ts->frac) / 65536.0);
@@ -185,11 +186,9 @@ static int manager_send_request(Manager *m) {
 
         m->event_timeout = sd_event_source_unref(m->event_timeout);
 
-        if (m->server_socket < 0) {
-                r = manager_listen_setup(m);
-                if (r < 0)
-                        return log_warning_errno(r, "Failed to setup connection socket: %m");
-        }
+        r = manager_listen_setup(m);
+        if (r < 0)
+                return log_warning_errno(r, "Failed to setup connection socket: %m");
 
         /*
          * Set transmit timestamp, remember it; the server will send that back
@@ -311,15 +310,11 @@ static int manager_clock_watch_setup(Manager *m) {
         safe_close(m->clock_watch_fd);
 
         m->clock_watch_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC);
-        if (m->clock_watch_fd < 0) {
-                log_error_errno(errno, "Failed to create timerfd: %m");
-                return -errno;
-        }
+        if (m->clock_watch_fd < 0)
+                return log_error_errno(errno, "Failed to create timerfd: %m");
 
-        if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0) {
-                log_error_errno(errno, "Failed to set up timerfd: %m");
-                return -errno;
-        }
+        if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0)
+                return log_error_errno(errno, "Failed to set up timerfd: %m");
 
         r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m);
         if (r < 0)
@@ -611,8 +606,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
         m->retry_interval = 0;
 
         /* Stop listening */
-        m->event_receive = sd_event_source_unref(m->event_receive);
-        m->server_socket = safe_close(m->server_socket);
+        manager_listen_stop(m);
 
         /* announce leap seconds */
         if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_PLUSSEC)
@@ -704,7 +698,9 @@ static int manager_listen_setup(Manager *m) {
 
         assert(m);
 
-        assert(m->server_socket < 0);
+        if (m->server_socket >= 0)
+                return 0;
+
         assert(!m->event_receive);
         assert(m->current_server_address);
 
@@ -727,6 +723,13 @@ static int manager_listen_setup(Manager *m) {
         return sd_event_add_io(m->event, &m->event_receive, m->server_socket, EPOLLIN, manager_receive_response, m);
 }
 
+static void manager_listen_stop(Manager *m) {
+        assert(m);
+
+        m->event_receive = sd_event_source_unref(m->event_receive);
+        m->server_socket = safe_close(m->server_socket);
+}
+
 static int manager_begin(Manager *m) {
         _cleanup_free_ char *pretty = NULL;
         int r;
@@ -956,8 +959,7 @@ void manager_disconnect(Manager *m) {
 
         m->event_timer = sd_event_source_unref(m->event_timer);
 
-        m->event_receive = sd_event_source_unref(m->event_receive);
-        m->server_socket = safe_close(m->server_socket);
+        manager_listen_stop(m);
 
         m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
         m->clock_watch_fd = safe_close(m->clock_watch_fd);