From: Martin Willi <martin@revosec.ch>
Date: Mon, 10 Feb 2014 16:11:42 +0000 (+0100)
Subject: swanctl: Add a subcommand to initiate connections by name
X-Git-Tag: 5.2.0dr3~8^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb1c409b8403ed9615b79b8657f5246647cd2191;p=thirdparty%2Fstrongswan.git

swanctl: Add a subcommand to initiate connections by name
---

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index 0e8065589f..968f795cd5 100644
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -2,6 +2,7 @@ sbin_PROGRAMS = swanctl
 
 swanctl_SOURCES = \
 	command.c command.h \
+	commands/initiate.c \
 	commands/list_sas.c \
 	swanctl.c
 
diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
new file mode 100644
index 0000000000..a4a83737c9
--- /dev/null
+++ b/src/swanctl/commands/initiate.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2014 Martin Willi
+ * Copyright (C) 2014 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program 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 General Public License
+ * for more details.
+ */
+
+#include "command.h"
+
+#include <errno.h>
+
+
+CALLBACK(log_cb, void,
+	bool *raw, char *name, vici_res_t *msg)
+{
+	if (*raw)
+	{
+		vici_dump(msg, "log", stdout);
+	}
+	else
+	{
+		printf("[%s] %s\n",
+			   vici_find_str(msg, "   ", "group"),
+			   vici_find_str(msg, "", "msg"));
+	}
+}
+
+static int initiate(vici_conn_t *conn)
+{
+	vici_req_t *req;
+	vici_res_t *res;
+	bool raw = FALSE;
+	char *arg, *child = NULL;
+	int ret = 0, timeout = 0, level = 1;
+
+	while (TRUE)
+	{
+		switch (command_getopt(&arg))
+		{
+			case 'h':
+				return command_usage(NULL);
+			case 'r':
+				raw = TRUE;
+				continue;
+			case 'c':
+				child = arg;
+				continue;
+			case 't':
+				timeout = atoi(arg);
+				continue;
+			case 'l':
+				level = atoi(arg);
+				continue;
+			case EOF:
+				break;
+			default:
+				return command_usage("invalid --initiate option");
+		}
+		break;
+	}
+
+	if (vici_register(conn, "control-log", log_cb, &raw) != 0)
+	{
+		fprintf(stderr, "registering for log failed: %s\n", strerror(errno));
+		return errno;
+	}
+	req = vici_begin("initiate");
+	if (child)
+	{
+		vici_add_key_valuef(req, "child", "%s", child);
+	}
+	if (timeout)
+	{
+		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
+	}
+	vici_add_key_valuef(req, "loglevel", "%d", level);
+	res = vici_submit(req, conn);
+	if (!res)
+	{
+		fprintf(stderr, "initiate request failed: %s\n", strerror(errno));
+		return errno;
+	}
+	if (raw)
+	{
+		vici_dump(res, "initiate reply", stdout);
+	}
+	else
+	{
+		if (streq(vici_find_str(res, "no", "success"), "yes"))
+		{
+			printf("initiate completed successfully\n");
+		}
+		else
+		{
+			fprintf(stderr, "initiate failed: %s\n",
+					vici_find_str(res, "", "errmsg"));
+			ret = 1;
+		}
+	}
+	vici_free_res(res);
+	return ret;
+}
+
+/**
+ * Register the command.
+ */
+static void __attribute__ ((constructor))reg()
+{
+	command_register((command_t) {
+		initiate, 'i', "initiate", "initiate a connection",
+		{"--child <name> [--timeout <s>] [--raw]"},
+		{
+			{"help",		'h', 0, "show usage information"},
+			{"child",		'c', 1, "initate a CHILD_SA configuration"},
+			{"timeout",		't', 1, "timeout in seconds before detaching"},
+			{"raw",			'r', 0, "dump raw response message"},
+			{"loglevel",	'l', 1, "verbosity of redirected log"},
+		}
+	});
+}