resolved: rename DNS UDP socket to 'dns_udp_fd'

This hopefully makes this a bit more expressive and clarifies that the
fd is not used for the DNS TCP socket. This also mimics how the LLMNR
UDP fd is named in the manager object.

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index 7b84c1bab86cf0bc8e1573e832fa3fd3a1f806b3..8092bb514d614f60e7d1ffa59ba53a1860c322e0 100644 (file)
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -39,8 +39,8 @@ DnsTransaction* dns_transaction_free(DnsTransaction *t) {
         dns_packet_unref(t->received);
         dns_answer_unref(t->cached);
 
-        sd_event_source_unref(t->dns_event_source);
-        safe_close(t->dns_fd);
+        sd_event_source_unref(t->dns_udp_event_source);
+        safe_close(t->dns_udp_fd);
 
         dns_server_unref(t->server);
         dns_stream_free(t->stream);
@@ -98,7 +98,7 @@ int dns_transaction_new(DnsTransaction **ret, DnsScope *s, DnsResourceKey *key)
         if (!t)
                 return -ENOMEM;
 
-        t->dns_fd = -1;
+        t->dns_udp_fd = -1;
         t->key = dns_resource_key_ref(key);
 
         /* Find a fresh, unused transaction id */
@@ -328,8 +328,8 @@ static void dns_transaction_next_dns_server(DnsTransaction *t) {
         assert(t);
 
         t->server = dns_server_unref(t->server);
-        t->dns_event_source = sd_event_source_unref(t->dns_event_source);
-        t->dns_fd = safe_close(t->dns_fd);
+        t->dns_udp_event_source = sd_event_source_unref(t->dns_udp_event_source);
+        t->dns_udp_fd = safe_close(t->dns_udp_fd);
 
         dns_scope_next_dns_server(t->scope);
 }
@@ -500,16 +500,16 @@ static int dns_transaction_emit(DnsTransaction *t) {
                 if (fd < 0)
                         return fd;
 
-                r = sd_event_add_io(t->scope->manager->event, &t->dns_event_source, fd, EPOLLIN, on_dns_packet, t);
+                r = sd_event_add_io(t->scope->manager->event, &t->dns_udp_event_source, fd, EPOLLIN, on_dns_packet, t);
                 if (r < 0)
                         return r;
 
-                t->dns_fd = fd;
+                t->dns_udp_fd = fd;
                 fd = -1;
                 t->server = dns_server_ref(server);
         }
 
-        r = dns_scope_emit(t->scope, t->dns_fd, t->sent);
+        r = dns_scope_emit(t->scope, t->dns_udp_fd, t->sent);
         if (r < 0)
                 return r;
 

diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h
index 4db9352a0483f147dd8adb89bffa572daee2ec2f..acf6a6f651a509323030bc554e02908f8dc61612 100644 (file)
--- a/src/resolve/resolved-dns-transaction.h
+++ b/src/resolve/resolved-dns-transaction.h
@@ -62,10 +62,10 @@ struct DnsTransaction {
         sd_event_source *timeout_event_source;
         unsigned n_attempts;
 
-        int dns_fd;
-        sd_event_source *dns_event_source;
+        int dns_udp_fd;
+        sd_event_source *dns_udp_event_source;
 
-        /* the active server */
+        /* The active server */
         DnsServer *server;
 
         /* TCP connection logic, if we need it */