]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: add small helper to pick DNS port number
authorLennart Poettering <lennart@poettering.net>
Tue, 4 Dec 2018 19:41:06 +0000 (20:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Dec 2018 16:16:29 +0000 (17:16 +0100)
This shouldn't be hidden in some function argument expression. Let's
make this more explicit by turning this into its own helper function.

src/resolve/resolved-dns-transaction.c

index f9b71a35c9afccb62d66918216f43fdbd2bab50b..4c0acf3a3fd195c2d9bdab313556b65842b7311d 100644 (file)
@@ -553,6 +553,10 @@ static int on_stream_packet(DnsStream *s) {
         return 0;
 }
 
+static uint16_t dns_port_for_feature_level(DnsServerFeatureLevel level) {
+        return DNS_SERVER_FEATURE_LEVEL_IS_TLS(level) ? 853 : 53;
+}
+
 static int dns_transaction_emit_tcp(DnsTransaction *t) {
         _cleanup_close_ int fd = -1;
         _cleanup_(dns_stream_unrefp) DnsStream *s = NULL;
@@ -580,7 +584,7 @@ static int dns_transaction_emit_tcp(DnsTransaction *t) {
                 if (t->server->stream && (DNS_SERVER_FEATURE_LEVEL_IS_TLS(t->current_feature_level) == t->server->stream->encrypted))
                         s = dns_stream_ref(t->server->stream);
                 else
-                        fd = dns_scope_socket_tcp(t->scope, AF_UNSPEC, NULL, t->server, DNS_SERVER_FEATURE_LEVEL_IS_TLS(t->current_feature_level) ? 853 : 53, &sa);
+                        fd = dns_scope_socket_tcp(t->scope, AF_UNSPEC, NULL, t->server, dns_port_for_feature_level(t->current_feature_level), &sa);
 
                 break;