From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 29 Jun 2017 08:09:47 +0000 (+0200)
Subject: swanctl: Read default socket from swanctl.socket option
X-Git-Tag: 5.6.0dr4~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4272a3e9d76d61e1468e9b3a124a01a35badcaac;p=thirdparty%2Fstrongswan.git

swanctl: Read default socket from swanctl.socket option

Also read from swanctl.plugins.vici.socket so we get
libstrongswan.plugins.vici.socket if it is defined.

Fixes #2372.
---

diff --git a/conf/options/swanctl.opt b/conf/options/swanctl.opt
index f78b4bccce..f2a8a0ff78 100644
--- a/conf/options/swanctl.opt
+++ b/conf/options/swanctl.opt
@@ -1,2 +1,5 @@
 swanctl.load =
-	Plugins to load in swanctl.
\ No newline at end of file
+	Plugins to load in swanctl.
+
+swanctl.socket = unix://${piddir}/charon.vici
+	VICI socket to connect to by default.
diff --git a/src/swanctl/command.c b/src/swanctl/command.c
index fd9bc00831..7f65d2b0e3 100644
--- a/src/swanctl/command.c
+++ b/src/swanctl/command.c
@@ -315,6 +315,10 @@ int command_dispatch(int c, char *v[])
 {
 	int op, i;
 
+	uri = lib->settings->get_str(lib->settings, "%s.socket",
+			lib->settings->get_str(lib->settings, "%s.plugins.vici.socket",
+								   NULL, lib->ns), lib->ns);
+
 	options = options_create();
 	atexit(cleanup);
 	active = help_idx = registered;