aiccu: Import various patches

[people/stevee/ipfire-3.x.git] / aiccu / patches / 0001-setup-script.patch

From bdb25774a216925fd1ca275a6e2b3ccc8e9a0200 Mon Sep 17 00:00:00 2001
From: Reinier Haasjes <reinier@haasjes.com>
Date: Fri, 17 Aug 2012 11:29:39 +0200
Subject: [PATCH 01/10] setup script

    Make setupscript work and add teardownscript setting.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 common/aiccu.c      | 6 +++---
 unix-console/main.c | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/aiccu.c b/common/aiccu.c
index 9abb334..7697136 100755
--- a/common/aiccu.c
+++ b/common/aiccu.c
@@ -212,9 +212,6 @@ bool aiccu_SaveConfig(const char *filename)
 	fprintf(f, "# Try to automatically login and setup the tunnel?\n");
 	fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false");
 	fprintf(f, "\n");
-	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
-	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
-	fprintf(f, "\n");
 	fprintf(f, "# TLS Required?\n");
 	fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false");
 	fprintf(f, "\n");
@@ -231,6 +228,9 @@ bool aiccu_SaveConfig(const char *filename)
 	fprintf(f, "# PID File\n");
 	fprintf(f, "pidfile %s\n", g_aiccu->pidfile);
 	fprintf(f, "\n");
+	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
+	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
+	fprintf(f, "\n");
 	fprintf(f, "# Make heartbeats (default true)\n");
 	fprintf(f, "# In general you don't want to turn this off\n");
 	fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n");
diff --git a/unix-console/main.c b/unix-console/main.c
index 8a4d9a9..1e7b4b4 100755
--- a/unix-console/main.c
+++ b/unix-console/main.c
@@ -471,6 +471,11 @@ int main(int argc, char *argv[])
 	 */
 	if (aiccu_setup(hTunnel, true))
 	{
+		if (g_aiccu->setupscript)
+		{
+			aiccu_exec("%s", g_aiccu->setupscript);
+		}
+
 		/* We need to stay running when doing Heartbeat or AYIYA */
 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
 			strcasecmp(hTunnel->sType, "ayiya") == 0)
-- 
1.8.1