From 88d2cb7c0e3884e5b8e37e20cb9911e7ab210cf7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 4 Sep 2020 13:09:02 +0900 Subject: [PATCH] resolve: make DnsStubListenerMode bitfield --- src/resolve/resolved-conf.h | 6 +++--- src/resolve/resolved-dns-stub.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h index f8d16b5a8ed..50a0caaf16b 100644 --- a/src/resolve/resolved-conf.h +++ b/src/resolve/resolved-conf.h @@ -7,9 +7,9 @@ typedef enum DnsStubListenerMode DnsStubListenerMode; enum DnsStubListenerMode { DNS_STUB_LISTENER_NO, - DNS_STUB_LISTENER_UDP, - DNS_STUB_LISTENER_TCP, - DNS_STUB_LISTENER_YES, + DNS_STUB_LISTENER_UDP = 1 << 0, + DNS_STUB_LISTENER_TCP = 1 << 1, + DNS_STUB_LISTENER_YES = DNS_STUB_LISTENER_UDP | DNS_STUB_LISTENER_TCP, _DNS_STUB_LISTENER_MODE_MAX, _DNS_STUB_LISTENER_MODE_INVALID = -1 }; diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index f9087a379fb..de37c9a0383 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -684,11 +684,11 @@ int manager_dns_stub_start(Manager *m) { m->dns_stub_listener_mode == DNS_STUB_LISTENER_TCP ? "TCP" : "UDP/TCP"); - if (IN_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_YES, DNS_STUB_LISTENER_UDP)) + if (FLAGS_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_UDP)) r = manager_dns_stub_udp_fd(m); if (r >= 0 && - IN_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_YES, DNS_STUB_LISTENER_TCP)) { + FLAGS_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_TCP)) { t = "TCP"; r = manager_dns_stub_tcp_fd(m); } -- 2.47.3