X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-server.h;h=45a7c4ff3b7563b7fb0fc1cc776973d33857f364;hb=6073b6f26ab9fc6bf335faa7073ec443eef093fd;hp=adceb868a32576fd6869cd9ae301c2df5384e880;hpb=74b2466e14a1961bf3ac0e8a60cfaceec705bd59;p=elogind.git

diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index adceb868a..45a7c4ff3 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -21,10 +21,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "in-addr-util.h"
+
 typedef struct DnsServer DnsServer;
 typedef enum DnsServerSource DnsServerSource;
 
-#include "in-addr-util.h"
 #include "resolved.h"
 #include "resolved-link.h"
 #include "resolved-dns-server.h"
@@ -32,7 +33,6 @@ typedef enum DnsServerSource DnsServerSource;
 enum DnsServerSource {
         DNS_SERVER_SYSTEM,
         DNS_SERVER_LINK,
-        DNS_SERVER_DHCP,
         _DNS_SERVER_SOURCE_MAX
 };
 
@@ -40,12 +40,12 @@ struct DnsServer {
         Manager *manager;
         DnsServerSource source;
 
-        unsigned char family;
-        union in_addr_union address;
+        Link *link;
 
-        bool marked;
+        int family;
+        union in_addr_union address;
 
-        Link *link;
+        bool marked:1;
 
         LIST_FIELDS(DnsServer, servers);
 };
@@ -53,9 +53,8 @@ struct DnsServer {
 int dns_server_new(
                 Manager *m,
                 DnsServer **s,
-                DnsServerSource source,
                 Link *l,
-                unsigned char family,
-                union in_addr_union *in_addr);
+                int family,
+                const union in_addr_union *address);
 
 DnsServer* dns_server_free(DnsServer *s);