# ------------------------------------------------------------------------------
if ENABLE_RESOLVED
systemd_resolved_SOURCES = \
- src/resolve/resolved.h \
src/resolve/resolved.c \
src/resolve/resolved-manager.c \
+ src/resolve/resolved-manager.h \
src/resolve/resolved-conf.c \
src/resolve/resolved-conf.h \
src/resolve/resolved-bus.c \
+ src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
src/resolve/resolved-dns-domain.h \
#include "bus-errors.h"
#include "bus-util.h"
-#include "resolved.h"
#include "resolved-dns-domain.h"
+#include "resolved-bus.h"
static int reply_query_state(DnsQuery *q) {
_cleanup_free_ char *ip = NULL;
--- /dev/null
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "resolved-manager.h"
+
+int manager_connect_bus(Manager *m);
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "resolved.h"
+#include "resolved-manager.h"
int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string);
int manager_parse_config_file(Manager *m);
typedef struct DnsQuery DnsQuery;
-#include "resolved.h"
#include "resolved-dns-scope.h"
#include "resolved-dns-rr.h"
#include "resolved-dns-question.h"
#include "resolved-dns-answer.h"
#include "resolved-dns-stream.h"
#include "resolved-dns-transaction.h"
+#include "resolved-manager.h"
struct DnsQuery {
Manager *manager;
typedef struct DnsScope DnsScope;
-#include "resolved.h"
-#include "resolved-link.h"
#include "resolved-dns-server.h"
#include "resolved-dns-packet.h"
#include "resolved-dns-query.h"
#include "resolved-dns-cache.h"
#include "resolved-dns-zone.h"
#include "resolved-dns-stream.h"
+#include "resolved-manager.h"
+#include "resolved-link.h"
typedef enum DnsScopeMatch {
DNS_SCOPE_NO,
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
-#include "resolved.h"
+#include "resolved-manager.h"
#include "resolved-link.h"
-#include "resolved-dns-server.h"
typedef enum DnsServerType {
DNS_SERVER_SYSTEM,
typedef struct DnsStream DnsStream;
-#include "resolved.h"
#include "resolved-dns-packet.h"
#include "resolved-dns-transaction.h"
+#include "resolved-manager.h"
struct DnsStream {
Manager *manager;
typedef struct Link Link;
typedef struct LinkAddress LinkAddress;
-#include "resolved.h"
#include "resolved-dns-server.h"
#include "resolved-dns-scope.h"
#include "resolved-dns-rr.h"
+#include "resolved-manager.h"
struct LinkAddress {
Link *link;
#include "af-list.h"
#include "utf8.h"
-#include "resolved.h"
-#include "resolved-conf.h"
#include "resolved-dns-domain.h"
+#include "resolved-conf.h"
+#include "resolved-bus.h"
+#include "resolved-manager.h"
#define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC)
#include "resolved-dns-server.h"
#include "resolved-dns-scope.h"
#include "resolved-dns-stream.h"
+#include "resolved-link.h"
typedef enum Support {
SUPPORT_NO,
int manager_next_hostname(Manager *m);
int manager_our_packet(Manager *m, DnsPacket *p);
-int manager_connect_bus(Manager *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#include "mkdir.h"
#include "capability.h"
-#include "resolved.h"
+#include "resolved-manager.h"
#include "resolved-conf.h"
int main(int argc, char *argv[]) {