picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve: rename dns_stub_extra_event_source -> event_source

Browse source 
As the name is too redundant.
This commit is contained in:
Yu Watanabe 2020-09-04 13:01:15 +09:00
parent 6421194b31
commit 8ae07803a0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/resolve/resolved-dns-stub.c
View file

@ -483,11 +483,11 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
goto fail;
}
r = sd_event_add_io(m->event, &l->dns_stub_extra_event_source, fd, EPOLLIN, on_dns_stub_packet, m);
r = sd_event_add_io(m->event, &l->event_source, fd, EPOLLIN, on_dns_stub_packet, m);
if (r < 0)
goto fail;
(void) sd_event_source_set_description(l->dns_stub_extra_event_source, "dns-stub-udp-extra");
(void) sd_event_source_set_description(l->event_source, "dns-stub-udp-extra");
l->fd = TAKE_FD(fd);
@ -639,11 +639,11 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
goto fail;
}
r = sd_event_add_io(m->event, &l->dns_stub_extra_event_source, fd, EPOLLIN, on_dns_stub_packet, m);
r = sd_event_add_io(m->event, &l->event_source, fd, EPOLLIN, on_dns_stub_packet, m);
if (r < 0)
goto fail;
(void) sd_event_source_set_description(l->dns_stub_extra_event_source, "dns-stub-tcp-extra");
(void) sd_event_source_set_description(l->event_source, "dns-stub-tcp-extra");
l->fd = TAKE_FD(fd);
@ -742,7 +742,7 @@ void manager_dns_stub_stop_extra(Manager *m) {
assert(m);
ORDERED_SET_FOREACH(l, m->dns_extra_stub_listeners, i) {
l->dns_stub_extra_event_source = sd_event_source_unref(l->dns_stub_extra_event_source);
l->event_source = sd_event_source_unref(l->event_source);
l->fd = safe_close(l->fd);
}
}

2
src/resolve/resolved-manager.h
View file

@ -36,7 +36,7 @@ typedef struct DNSStubListenerExtra {
DnsStubListenerMode mode;
SocketAddress address;
sd_event_source *dns_stub_extra_event_source;
sd_event_source *event_source;
} DNSStubListenerExtra;
struct Manager {