Wireless Daemon for Linux
 help / color / mirror / Atom feed
From: Tim Kourt <tim.a.kourt@linux.intel.com>
To: iwd@lists.01.org
Subject: [PATCH 2/2] resolve: Add systemd-resolved domain name installer
Date: Mon, 09 Dec 2019 15:28:05 -0800	[thread overview]
Message-ID: <20191209232805.2873-2-tim.a.kourt@linux.intel.com> (raw)
In-Reply-To: <20191209232805.2873-1-tim.a.kourt@linux.intel.com>

[-- Attachment #1: Type: text/plain, Size: 3768 bytes --]

---
 src/resolve.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/resolve.h |  1 +
 2 files changed, 83 insertions(+)

diff --git a/src/resolve.c b/src/resolve.c
index 387e0b3c..0c06d521 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -42,6 +42,8 @@ struct resolve_method_ops {
 	void (*exit)(void *data);
 	void (*add_dns)(uint32_t ifindex, uint8_t type, char **dns_list,
 								void *data);
+	void (*add_domain_name)(uint32_t ifindex, char *domain_name,
+								void *data);
 	void (*remove)(uint32_t ifindex, void *data);
 };
 
@@ -177,6 +179,74 @@ static void resolve_systemd_add_dns(uint32_t ifindex, uint8_t type,
 								state, NULL);
 }
 
+static void systemd_link_add_domains_reply(struct l_dbus_message *message,
+								void *user_data)
+{
+	const char *name;
+	const char *text;
+
+	if (!l_dbus_message_is_error(message))
+		return;
+
+	l_dbus_message_get_error(message, &name, &text);
+
+	l_error("resolve-systemd: Failed to modify the domain entries. %s: %s",
+								name, text);
+}
+
+static void resolve_systemd_add_domain_name(uint32_t ifindex, char *domain_name,
+								void *data)
+{
+	struct systemd_state *state = data;
+	struct l_dbus_message_builder *builder;
+	struct l_dbus_message *message;
+	bool routing_domain;
+
+	l_debug("ifindex: %u", ifindex);
+
+	if (!state->is_ready) {
+		l_error("resolve-systemd: Failed to add domain name. "
+				"Is 'systemd-resolved' service running?");
+
+		return;
+	}
+
+	message =
+		l_dbus_message_new_method_call(dbus_get_bus(),
+					SYSTEMD_RESOLVED_SERVICE,
+					SYSTEMD_RESOLVED_MANAGER_PATH,
+					SYSTEMD_RESOLVED_MANAGER_INTERFACE,
+					"SetLinkDomains");
+
+	if (!message)
+		return;
+
+	builder = l_dbus_message_builder_new(message);
+	if (!builder) {
+		l_dbus_message_unref(message);
+		return;
+	}
+
+	routing_domain = true;
+
+	l_dbus_message_builder_append_basic(builder, 'i', &ifindex);
+
+	l_dbus_message_builder_enter_array(builder, "(sb)");
+
+	l_dbus_message_builder_enter_struct(builder, "sb");
+	l_dbus_message_builder_append_basic(builder, 's', domain_name);
+	l_dbus_message_builder_append_basic(builder, 'b', &routing_domain);
+	l_dbus_message_builder_leave_struct(builder);
+
+	l_dbus_message_builder_leave_array(builder);
+
+	l_dbus_message_builder_finalize(builder);
+	l_dbus_message_builder_destroy(builder);
+
+	l_dbus_send_with_reply(dbus_get_bus(), message,
+				systemd_link_add_domains_reply, state, NULL);
+}
+
 static void resolve_systemd_remove(uint32_t ifindex, void *data)
 {
 	struct systemd_state *state = data;
@@ -249,6 +319,7 @@ static const struct resolve_method_ops resolve_method_systemd = {
 	.init = resolve_systemd_init,
 	.exit = resolve_systemd_exit,
 	.add_dns = resolve_systemd_add_dns,
+	.add_domain_name = resolve_systemd_add_domain_name,
 	.remove = resolve_systemd_remove,
 };
 
@@ -376,6 +447,17 @@ void resolve_add_dns(uint32_t ifindex, uint8_t type, char **dns_list)
 	method.ops->add_dns(ifindex, type, dns_list, method.data);
 }
 
+void resolve_add_domain_name(uint32_t ifindex, char *domain_name)
+{
+	if (!domain_name)
+		return;
+
+	if (!method.ops || !method.ops->add_dns)
+		return;
+
+	method.ops->add_domain_name(ifindex, domain_name, method.data);
+}
+
 void resolve_remove(uint32_t ifindex)
 {
 	if (!method.ops || !method.ops->remove)
diff --git a/src/resolve.h b/src/resolve.h
index b0335868..68aaa7d6 100644
--- a/src/resolve.h
+++ b/src/resolve.h
@@ -21,4 +21,5 @@
  */
 
 void resolve_add_dns(uint32_t ifindex, uint8_t type, char **dns_list);
+void resolve_add_domain_name(uint32_t ifindex, char *domain_name);
 void resolve_remove(uint32_t ifindex);
-- 
2.13.6

      parent reply	other threads:[~2019-12-09 23:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 23:28 [PATCH 1/2] netconfig: Add IPv4 domain name helper and installer Tim Kourt
2019-12-09 15:23 ` Denis Kenzior
2019-12-09 23:28 ` Tim Kourt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191209232805.2873-2-tim.a.kourt@linux.intel.com \
    --to=tim.a.kourt@linux.intel.com \
    --cc=iwd@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox