resolve: use sd_event_source_set_io_fd_own() for stub listners

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 74e4f261c3292bd51352335246a04a30b0232769..9ef0b0a96086cf66b10e3b01119a289af4cd3f73 100644 (file)
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -20,15 +20,10 @@ static int manager_dns_stub_tcp_fd(Manager *m);
 int dns_stub_listener_extra_new(DNSStubListenerExtra **ret) {
         DNSStubListenerExtra *l;
 
-        l = new(DNSStubListenerExtra, 1);
+        l = new0(DNSStubListenerExtra, 1);
         if (!l)
                 return -ENOMEM;
 
-        *l = (DNSStubListenerExtra) {
-                .udp_fd = -1,
-                .tcp_fd = -1,
-        };
-
         *ret = TAKE_PTR(l);
 
         return 0;
@@ -40,8 +35,6 @@ DNSStubListenerExtra *dns_stub_listener_extra_free(DNSStubListenerExtra *p) {
 
         p->udp_event_source = sd_event_source_unref(p->udp_event_source);
         p->tcp_event_source = sd_event_source_unref(p->tcp_event_source);
-        p->udp_fd = safe_close(p->udp_fd);
-        p->tcp_fd = safe_close(p->tcp_fd);
 
         return mfree(p);
 }
@@ -459,8 +452,8 @@ static int manager_dns_stub_udp_fd(Manager *m) {
         _cleanup_close_ int fd = -1;
         int r;
 
-        if (m->dns_stub_udp_fd >= 0)
-                return m->dns_stub_udp_fd;
+        if (m->dns_stub_udp_event_source)
+                return sd_event_source_get_io_fd(m->dns_stub_udp_event_source);
 
         fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
         if (fd < 0)
@@ -482,9 +475,13 @@ static int manager_dns_stub_udp_fd(Manager *m) {
         if (r < 0)
                 return r;
 
+        r = sd_event_source_set_io_fd_own(m->dns_stub_udp_event_source, true);
+        if (r < 0)
+                return r;
+
         (void) sd_event_source_set_description(m->dns_stub_udp_event_source, "dns-stub-udp");
 
-        return m->dns_stub_udp_fd = TAKE_FD(fd);
+        return TAKE_FD(fd);
 }
 
 static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
@@ -493,7 +490,7 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         union sockaddr_union sa;
         int r;
 
-        if (l->udp_fd >= 0)
+        if (l->udp_event_source)
                 return 0;
 
         if (l->family == AF_INET)
@@ -534,6 +531,10 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         if (r < 0)
                 goto fail;
 
+        r = sd_event_source_set_io_fd_own(l->udp_event_source, true);
+        if (r < 0)
+                goto fail;
+
         (void) sd_event_source_set_description(l->udp_event_source, "dns-stub-udp-extra");
 
         if (DEBUG_LOGGING) {
@@ -541,9 +542,7 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
                 log_debug("Listening on UDP socket %s.", strnull(pretty));
         }
 
-        l->udp_fd = TAKE_FD(fd);
-
-        return 0;
+        return TAKE_FD(fd);
 
 fail:
         assert(r < 0);
@@ -607,8 +606,8 @@ static int manager_dns_stub_tcp_fd(Manager *m) {
         _cleanup_close_ int fd = -1;
         int r;
 
-        if (m->dns_stub_tcp_fd >= 0)
-                return m->dns_stub_tcp_fd;
+        if (m->dns_stub_tcp_event_source)
+                return sd_event_source_get_io_fd(m->dns_stub_tcp_event_source);
 
         fd = socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
         if (fd < 0)
@@ -637,9 +636,13 @@ static int manager_dns_stub_tcp_fd(Manager *m) {
         if (r < 0)
                 return r;
 
+        r = sd_event_source_set_io_fd_own(m->dns_stub_tcp_event_source, true);
+        if (r < 0)
+                return r;
+
         (void) sd_event_source_set_description(m->dns_stub_tcp_event_source, "dns-stub-tcp");
 
-        return m->dns_stub_tcp_fd = TAKE_FD(fd);
+        return TAKE_FD(fd);
 }
 
 static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
@@ -648,8 +651,8 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         union sockaddr_union sa;
         int r;
 
-        if (l->tcp_fd >= 0)
-                return 0;
+        if (l->tcp_event_source)
+                return sd_event_source_get_io_fd(l->tcp_event_source);;
 
         if (l->family == AF_INET)
                 sa = (union sockaddr_union) {
@@ -698,6 +701,10 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         if (r < 0)
                 goto fail;
 
+        r = sd_event_source_set_io_fd_own(l->tcp_event_source, true);
+        if (r < 0)
+                goto fail;
+
         (void) sd_event_source_set_description(l->tcp_event_source, "dns-stub-tcp-extra");
 
         if (DEBUG_LOGGING) {
@@ -705,9 +712,7 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
                 log_debug("Listening on TCP socket %s.", strnull(pretty));
         }
 
-        l->tcp_fd = TAKE_FD(fd);
-
-        return 0;
+        return TAKE_FD(fd);
 
 fail:
         assert(r < 0);
@@ -775,7 +780,4 @@ void manager_dns_stub_stop(Manager *m) {
 
         m->dns_stub_udp_event_source = sd_event_source_unref(m->dns_stub_udp_event_source);
         m->dns_stub_tcp_event_source = sd_event_source_unref(m->dns_stub_tcp_event_source);
-
-        m->dns_stub_udp_fd = safe_close(m->dns_stub_udp_fd);
-        m->dns_stub_tcp_fd = safe_close(m->dns_stub_tcp_fd);
 }

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 50d8b01d9aaf581859804df2234c1656c2b26a87..faf1a82155c9e513a5c633b98325ea7c07f5a654 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -578,8 +578,6 @@ int manager_new(Manager **ret) {
                 .llmnr_ipv6_tcp_fd = -1,
                 .mdns_ipv4_fd = -1,
                 .mdns_ipv6_fd = -1,
-                .dns_stub_udp_fd = -1,
-                .dns_stub_tcp_fd = -1,
                 .hostname_fd = -1,
 
                 .llmnr_support = DEFAULT_LLMNR_MODE,

diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index 9eee30761c7cbeff028f01009356c36543fdb2d8..80665876b2b3fdf3cd205430663bf5fd01b2e745 100644 (file)
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -32,9 +32,6 @@ typedef struct EtcHosts {
 } EtcHosts;
 
 typedef struct DNSStubListenerExtra {
-        int udp_fd;
-        int tcp_fd;
-
         DnsStubListenerMode mode;
 
         int family;
@@ -147,12 +144,9 @@ struct Manager {
         dev_t etc_hosts_dev;
         bool read_etc_hosts;
 
-        /* Local DNS stub on 127.0.0.53:53 */
-        int dns_stub_udp_fd;
-        int dns_stub_tcp_fd;
-
         OrderedSet *dns_extra_stub_listeners;
 
+        /* Local DNS stub on 127.0.0.53:53 */
         sd_event_source *dns_stub_udp_event_source;
         sd_event_source *dns_stub_tcp_event_source;