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

resolved: we don't need the DNS server "source" concept anymore, remove it

Browse source
This commit is contained in:
Lennart Poettering 2014-07-29 21:46:12 +02:00
parent 70b34f5de8
commit 2f82f5eae4
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/resolve/resolved-dns-server.c
View file

@ -44,11 +44,9 @@ int dns_server_new(
LIST_FIND_TAIL(servers, l->dns_servers, tail);
LIST_INSERT_AFTER(servers, l->dns_servers, tail, s);
s->link = l;
s->source = DNS_SERVER_LINK;
} else {
LIST_FIND_TAIL(servers, m->dns_servers, tail);
LIST_INSERT_AFTER(servers, m->dns_servers, tail, s);
s->source = DNS_SERVER_SYSTEM;
}
s->manager = m;
@ -63,13 +61,10 @@ DnsServer* dns_server_free(DnsServer *s) {
if (!s)
return NULL;
if (s->source == DNS_SERVER_LINK) {
if (s->manager) {
if (s->link)
LIST_REMOVE(servers, s->link->dns_servers, s);
} else if (s->source == DNS_SERVER_SYSTEM) {
if (s->manager)
else
LIST_REMOVE(servers, s->manager->dns_servers, s);
}

8
src/resolve/resolved-dns-server.h
View file

@ -30,16 +30,8 @@ typedef enum DnsServerSource DnsServerSource;
#include "resolved-link.h"
#include "resolved-dns-server.h"
enum DnsServerSource {
DNS_SERVER_ANY,
DNS_SERVER_SYSTEM,
DNS_SERVER_LINK,
_DNS_SERVER_SOURCE_MAX
};
struct DnsServer {
Manager *manager;
DnsServerSource source;
Link *link;