chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve-host: use the usual log message when encountering a dbus parse failure
[elogind.git]
/
src
/
resolve
/
resolved-dns-server.h
diff --git
a/src/resolve/resolved-dns-server.h
b/src/resolve/resolved-dns-server.h
index 781e237627c5bae329510dc093cc03ecc351698e..574616ef0fa625c3ee3567af139fd666317e30d2 100644
(file)
--- a/
src/resolve/resolved-dns-server.h
+++ b/
src/resolve/resolved-dns-server.h
@@
-30,20
+30,12
@@
typedef enum DnsServerSource DnsServerSource;
#include "resolved-link.h"
#include "resolved-dns-server.h"
#include "resolved-link.h"
#include "resolved-dns-server.h"
-enum DnsServerSource {
- DNS_SERVER_SYSTEM,
- DNS_SERVER_LINK,
- DNS_SERVER_DHCP,
- _DNS_SERVER_SOURCE_MAX
-};
-
struct DnsServer {
Manager *manager;
struct DnsServer {
Manager *manager;
- DnsServerSource source;
Link *link;
Link *link;
-
unsigned char
family;
+
int
family;
union in_addr_union address;
bool marked:1;
union in_addr_union address;
bool marked:1;
@@
-54,9
+46,8
@@
struct DnsServer {
int dns_server_new(
Manager *m,
DnsServer **s,
int dns_server_new(
Manager *m,
DnsServer **s,
- DnsServerSource source,
Link *l,
Link *l,
-
unsigned char
family,
+
int
family,
const union in_addr_union *address);
DnsServer* dns_server_free(DnsServer *s);
const union in_addr_union *address);
DnsServer* dns_server_free(DnsServer *s);