chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
96c76ac
)
resolved: unify logic how we flush out DNS servers we learnt
author
Lennart Poettering
<lennart@poettering.net>
Tue, 12 Aug 2014 17:32:55 +0000
(19:32 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 12 Aug 2014 17:32:55 +0000
(19:32 +0200)
src/resolve/resolved-conf.c
patch
|
blob
|
history
src/resolve/resolved-dns-server.c
patch
|
blob
|
history
src/resolve/resolved-dns-server.h
patch
|
blob
|
history
src/resolve/resolved-manager.c
patch
|
blob
|
history
src/resolve/resolved-manager.h
patch
|
blob
|
history
diff --git
a/src/resolve/resolved-conf.c
b/src/resolve/resolved-conf.c
index ae3773f4f7cd7d3d4f8e5bfceaacd43d0ff89219..63e87f8df52c44cae9d49c663d2af8cb442a58da 100644
(file)
--- a/
src/resolve/resolved-conf.c
+++ b/
src/resolve/resolved-conf.c
@@
-81,7
+81,6
@@
int config_parse_dnsv(
void *userdata) {
Manager *m = userdata;
void *userdata) {
Manager *m = userdata;
- DnsServer **l;
int r;
assert(filename);
int r;
assert(filename);
@@
-89,19
+88,10
@@
int config_parse_dnsv(
assert(rvalue);
assert(m);
assert(rvalue);
assert(m);
- if (ltype == DNS_SERVER_FALLBACK)
- l = &m->fallback_dns_servers;
- else
- l = &m->dns_servers;
-
- if (isempty(rvalue)) {
-
+ if (isempty(rvalue))
/* Empty assignment means clear the list */
/* Empty assignment means clear the list */
- while (*l)
- dns_server_free(*l);
-
- } else {
-
+ manager_flush_dns_servers(m, ltype);
+ else {
/* Otherwise add to the list */
r = manager_parse_dns_server(m, ltype, rvalue);
if (r < 0) {
/* Otherwise add to the list */
r = manager_parse_dns_server(m, ltype, rvalue);
if (r < 0) {
diff --git
a/src/resolve/resolved-dns-server.c
b/src/resolve/resolved-dns-server.c
index 043f6b637d8aedca68d5965ea2f68c7d12066ad9..c99768be4fe4f9f20bfebdad9784a781d7f94076 100644
(file)
--- a/
src/resolve/resolved-dns-server.c
+++ b/
src/resolve/resolved-dns-server.c
@@
-64,9
+64,9
@@
int dns_server_new(
* we used so far was a fallback one? Then let's try to pick
* the new one */
if (type != DNS_SERVER_FALLBACK &&
* we used so far was a fallback one? Then let's try to pick
* the new one */
if (type != DNS_SERVER_FALLBACK &&
-
s->manager
->current_dns_server &&
-
s->manager
->current_dns_server->type == DNS_SERVER_FALLBACK)
- manager_set_dns_server(
s->manager
, NULL);
+
m
->current_dns_server &&
+
m
->current_dns_server->type == DNS_SERVER_FALLBACK)
+ manager_set_dns_server(
m
, NULL);
if (ret)
*ret = s;
if (ret)
*ret = s;
@@
-87,14
+87,14
@@
DnsServer* dns_server_free(DnsServer *s) {
LIST_REMOVE(servers, s->manager->fallback_dns_servers, s);
else
assert_not_reached("Unknown server type");
LIST_REMOVE(servers, s->manager->fallback_dns_servers, s);
else
assert_not_reached("Unknown server type");
+
+ if (s->manager->current_dns_server == s)
+ manager_set_dns_server(s->manager, NULL);
}
if (s->link && s->link->current_dns_server == s)
link_set_dns_server(s->link, NULL);
}
if (s->link && s->link->current_dns_server == s)
link_set_dns_server(s->link, NULL);
- if (s->manager && s->manager->current_dns_server == s)
- manager_set_dns_server(s->manager, NULL);
-
free(s);
return NULL;
free(s);
return NULL;
diff --git
a/src/resolve/resolved-dns-server.h
b/src/resolve/resolved-dns-server.h
index 5178a6be7e827295f75c56da684eb1f909113088..f2361a8385b995af0d7aff570159a5d4a9e56208 100644
(file)
--- a/
src/resolve/resolved-dns-server.h
+++ b/
src/resolve/resolved-dns-server.h
@@
-26,15
+26,15
@@
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
-#include "resolved-manager.h"
-#include "resolved-link.h"
-
typedef enum DnsServerType {
DNS_SERVER_SYSTEM,
DNS_SERVER_FALLBACK,
DNS_SERVER_LINK,
} DnsServerType;
typedef enum DnsServerType {
DNS_SERVER_SYSTEM,
DNS_SERVER_FALLBACK,
DNS_SERVER_LINK,
} DnsServerType;
+#include "resolved-manager.h"
+#include "resolved-link.h"
+
struct DnsServer {
Manager *manager;
struct DnsServer {
Manager *manager;
diff --git
a/src/resolve/resolved-manager.c
b/src/resolve/resolved-manager.c
index 6bb089451f1b8d1a09d07f1df4e1abe3eb9fb3ff..a2de2edb48f5a76d2398dc3abbd2ca03bcea352a 100644
(file)
--- a/
src/resolve/resolved-manager.c
+++ b/
src/resolve/resolved-manager.c
@@
-536,10
+536,8
@@
Manager *manager_free(Manager *m) {
dns_scope_free(m->unicast_scope);
dns_scope_free(m->unicast_scope);
- while (m->dns_servers)
- dns_server_free(m->dns_servers);
- while (m->fallback_dns_servers)
- dns_server_free(m->fallback_dns_servers);
+ manager_flush_dns_servers(m, DNS_SERVER_SYSTEM);
+ manager_flush_dns_servers(m, DNS_SERVER_FALLBACK);
hashmap_free(m->links);
hashmap_free(m->dns_transactions);
hashmap_free(m->links);
hashmap_free(m->dns_transactions);
@@
-1771,6
+1769,18
@@
void manager_verify_all(Manager *m) {
dns_zone_verify_all(&s->zone);
}
dns_zone_verify_all(&s->zone);
}
+void manager_flush_dns_servers(Manager *m, DnsServerType t) {
+ assert(m);
+
+ if (t == DNS_SERVER_SYSTEM)
+ while (m->dns_servers)
+ dns_server_free(m->dns_servers);
+
+ if (t == DNS_SERVER_FALLBACK)
+ while (m->fallback_dns_servers)
+ dns_server_free(m->fallback_dns_servers);
+}
+
static const char* const support_table[_SUPPORT_MAX] = {
[SUPPORT_NO] = "no",
[SUPPORT_YES] = "yes",
static const char* const support_table[_SUPPORT_MAX] = {
[SUPPORT_NO] = "no",
[SUPPORT_YES] = "yes",
diff --git
a/src/resolve/resolved-manager.h
b/src/resolve/resolved-manager.h
index f8cb91c330baab775d4e77022fc0df606e989751..78cbfc0b03123ad3db84b94bda5582b8357b2ece 100644
(file)
--- a/
src/resolve/resolved-manager.h
+++ b/
src/resolve/resolved-manager.h
@@
-151,6
+151,8
@@
DnsScope* manager_find_scope(Manager *m, DnsPacket *p);
void manager_verify_all(Manager *m);
void manager_verify_all(Manager *m);
+void manager_flush_dns_servers(Manager *m, DnsServerType t);
+
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define EXTRA_CMSG_SPACE 1024
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define EXTRA_CMSG_SPACE 1024