From 1d5147bf3b7a6a0b5a40d651ead2b7d755dfbac6 Mon Sep 17 00:00:00 2001
From: Keith Moyer <tomatovpn@keithmoyer.com>
Date: Thu, 26 Mar 2009 23:12:06 -0500
Subject: [PATCH] Automatic startup

---
 release/src/router/httpd/tomato.c     |  2 ++
 release/src/router/nvram/defaults.c   |  2 ++
 release/src/router/rc/rc.h            |  2 ++
 release/src/router/rc/services.c      |  1 +
 release/src/router/rc/vpn.c           | 22 ++++++++++++++++++++++
 release/src/router/www/vpn-client.asp |  9 ++++++++-
 release/src/router/www/vpn-server.asp |  9 ++++++++-
 7 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index fbade5e107..6b970b1021 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -669,6 +669,7 @@ static const nvset_t nvset_list[] = {
 
 // vpn
 	{ "vpn_debug",            V_01                },
+	{ "vpn_server_eas",       V_NONE              },
 	{ "vpn_server1_if",       V_TEXT(3, 3)        },  // tap, tun
 	{ "vpn_server1_proto",    V_TEXT(3, 10)       },  // udp, tcp-server
 	{ "vpn_server1_port",     V_PORT              },
@@ -719,6 +720,7 @@ static const nvset_t nvset_list[] = {
 	{ "vpn_server2_crt",      V_NONE              },
 	{ "vpn_server2_key",      V_NONE              },
 	{ "vpn_server2_dh",       V_NONE              },
+	{ "vpn_client_eas",       V_NONE              },
 	{ "vpn_client1_if",       V_TEXT(3, 3)        },  // tap, tun
 	{ "vpn_client1_bridge",   V_01                },
 	{ "vpn_client1_nat",      V_01                },
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 2ac94e4cb8..6bb3f82c43 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -474,6 +474,7 @@ const defaults_t defaults[] = {
 
 // vpn
 	{ "vpn_debug",            "0"             },
+	{ "vpn_server_eas",       ""              },
 	{ "vpn_server1_if",       "tap"           },
 	{ "vpn_server1_proto",    "udp"           },
 	{ "vpn_server1_port",     "1194"          },
@@ -524,6 +525,7 @@ const defaults_t defaults[] = {
 	{ "vpn_server2_cert",     ""              },
 	{ "vpn_server2_key",      ""              },
 	{ "vpn_server2_dh",       ""              },
+	{ "vpn_client_eas",       ""              },
 	{ "vpn_client1_if",       "tap"           },
 	{ "vpn_client1_bridge",   "1"             },
 	{ "vpn_client1_nat",      "1"             },
diff --git a/release/src/router/rc/rc.h b/release/src/router/rc/rc.h
index d5812111e2..1f25636bd2 100644
--- a/release/src/router/rc/rc.h
+++ b/release/src/router/rc/rc.h
@@ -318,12 +318,14 @@ extern void start_vpnclient(int clientNum);
 extern void stop_vpnclient(int clientNum);
 extern void start_vpnserver(int serverNum);
 extern void stop_vpnserver(int serverNum);
+extern void start_vpn_eas();
 extern void run_vpn_firewall_scripts();
 #else
 static inline void start_vpnclient(int clientNum) {}
 static inline void stop_vpnclient(int clientNum) {}
 static inline void start_vpnserver(int serverNum) {}
 static inline void stop_vpnserver(int serverNum) {}
+static inline void start_vpn_eas() {}
 static inline void run_vpn_firewall_scripts() {}
 #endif
 
diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c
index a12defb70f..b3bcd71402 100644
--- a/release/src/router/rc/services.c
+++ b/release/src/router/rc/services.c
@@ -705,6 +705,7 @@ void start_services(void)
 #ifdef TCONFIG_SAMBA
 	start_smbd();
 #endif
+	start_vpn_eas();
 }
 
 void stop_services(void)
diff --git a/release/src/router/rc/vpn.c b/release/src/router/rc/vpn.c
index 8597fce430..af5a1a5f9e 100644
--- a/release/src/router/rc/vpn.c
+++ b/release/src/router/rc/vpn.c
@@ -793,6 +793,28 @@ void stop_vpnserver(int serverNum)
 	vpnlog(VPN_LOG_INFO,"VPN GUI server backend stopped.");
 }
 
+void start_vpn_eas()
+{
+	char buffer[16], *cur;
+	int nums[4], i;
+
+	// Parse and start servers
+	strlcpy(&buffer[0], nvram_safe_get("vpn_server_eas"), sizeof(buffer));
+	if ( strlen(&buffer[0]) != 0 ) vpnlog(VPN_LOG_INFO, "Starting servers (eas): %s", &buffer[0]);
+	i = 0;
+	for( cur = strtok(&buffer[0],","); cur != NULL && i < 4; cur = strtok(NULL, ",")) { nums[i++] = atoi(cur); }
+	nums[i] = 0;
+	for( i = 0; nums[i] > 0; i++ ) { vpnlog(VPN_LOG_INFO, "Starting server %d (eas)", nums[i]); start_vpnserver(nums[i]); }
+
+	// Parse and start clients
+	strlcpy(&buffer[0], nvram_safe_get("vpn_client_eas"), sizeof(buffer));
+	if ( strlen(&buffer[0]) != 0 ) vpnlog(VPN_LOG_INFO, "Starting clients (eas): %s", &buffer[0]);
+	i = 0;
+	for( cur = strtok(&buffer[0],","); cur != NULL && i < 4; cur = strtok(NULL, ",")) { nums[i++] = atoi(cur); }
+	nums[i] = 0;
+	for( i = 0; nums[i] > 0; i++ ) { vpnlog(VPN_LOG_INFO, "Starting client %d (eas)", nums[i]); start_vpnclient(nums[i]); }
+}
+
 void run_vpn_firewall_scripts()
 {
 	DIR *dir;
diff --git a/release/src/router/www/vpn-client.asp b/release/src/router/www/vpn-client.asp
index c779c9f43b..e8918f2993 100644
--- a/release/src/router/www/vpn-client.asp
+++ b/release/src/router/www/vpn-client.asp
@@ -20,7 +20,7 @@
 <script type='text/javascript' src='vpnciphers.js'></script>
 <script type='text/javascript'>
 
-//	<% nvram("vpn_client1_if,vpn_client1_bridge,vpn_client1_nat,vpn_client1_proto,vpn_client1_addr,vpn_client1_port,vpn_client1_retry,vpn_client1_firewall,vpn_client1_crypt,vpn_client1_comp,vpn_client1_cipher,vpn_client1_local,vpn_client1_remote,vpn_client1_nm,vpn_client1_hmac,vpn_client1_custom,vpn_client1_static,vpn_client1_ca,vpn_client1_crt,vpn_client1_key,vpn_client2_if,vpn_client2_bridge,vpn_client2_nat,vpn_client2_proto,vpn_client2_addr,vpn_client2_port,vpn_client2_retry,vpn_client2_firewall,vpn_client2_crypt,vpn_client2_comp,vpn_client2_cipher,vpn_client2_local,vpn_client2_remote,vpn_client2_nm,vpn_client2_hmac,vpn_client2_custom,vpn_client2_static,vpn_client2_ca,vpn_client2_crt,vpn_client2_key"); %>
+//	<% nvram("vpn_client_eas,vpn_client1_if,vpn_client1_bridge,vpn_client1_nat,vpn_client1_proto,vpn_client1_addr,vpn_client1_port,vpn_client1_retry,vpn_client1_firewall,vpn_client1_crypt,vpn_client1_comp,vpn_client1_cipher,vpn_client1_local,vpn_client1_remote,vpn_client1_nm,vpn_client1_hmac,vpn_client1_custom,vpn_client1_static,vpn_client1_ca,vpn_client1_crt,vpn_client1_key,vpn_client2_if,vpn_client2_bridge,vpn_client2_nat,vpn_client2_proto,vpn_client2_addr,vpn_client2_port,vpn_client2_retry,vpn_client2_firewall,vpn_client2_crypt,vpn_client2_comp,vpn_client2_cipher,vpn_client2_local,vpn_client2_remote,vpn_client2_nm,vpn_client2_hmac,vpn_client2_custom,vpn_client2_static,vpn_client2_ca,vpn_client2_crt,vpn_client2_key"); %>
 
 tabs = [['client1', 'Client 1'],['client2', 'Client 2']];
 sections = [['basic', 'Basic'],['advanced', 'Advanced'],['keys','Keys']];
@@ -156,10 +156,15 @@ function save()
 
 	var fom = E('_fom');
 
+	E('vpn_client_eas').value = '';
+
 	for (i = 0; i < tabs.length; ++i)
 	{
 		t = tabs[i][0];
 
+		if ( E('_f_vpn_'+t+'_eas').checked )
+			E('vpn_client_eas').value += ''+(i+1)+',';
+
 		E('vpn_'+t+'_bridge').value = E('_f_vpn_'+t+'_bridge').checked ? 1 : 0;
 		E('vpn_'+t+'_nat').value = E('_f_vpn_'+t+'_nat').checked ? 1 : 0;
 	}
@@ -202,6 +207,7 @@ textarea {
 <input type='hidden' name='_nextpage' value='vpn-client.asp'>
 <input type='hidden' name='_nextwait' value='5'>
 <input type='hidden' name='_service' value=''>
+<input type='hidden' name='vpn_client_eas' id='vpn_client_eas' value=''>
 
 <div class='section-title'>VPN Client Configuration</div>
 <div class='section'>
@@ -224,6 +230,7 @@ for (i = 0; i < tabs.length; ++i)
 
 	W('<div id=\''+t+'-basic\'>');
 	createFieldTable('', [
+		{ title: 'Start with Router', name: 'f_vpn_'+t+'_eas', type: 'checkbox', value: nvram.vpn_client_eas.indexOf(''+(i+1)) >= 0 },
 		{ title: 'Interface Type', name: 'vpn_'+t+'_if', type: 'select', options: [ ['tap','TAP'], ['tun','TUN'] ], value: eval( 'nvram.vpn_'+t+'_if' ) },
 		{ title: 'Protocol', name: 'vpn_'+t+'_proto', type: 'select', options: [ ['udp','UDP'], ['tcp-client','TCP'] ], value: eval( 'nvram.vpn_'+t+'_proto' ) },
 		{ title: 'Server Address/Port', multi: [
diff --git a/release/src/router/www/vpn-server.asp b/release/src/router/www/vpn-server.asp
index 1802911da3..4de65fa250 100644
--- a/release/src/router/www/vpn-server.asp
+++ b/release/src/router/www/vpn-server.asp
@@ -20,7 +20,7 @@
 <script type='text/javascript' src='vpnciphers.js'></script>
 <script type='text/javascript'>
 
-//	<% nvram("vpn_server1_if,vpn_server1_proto,vpn_server1_port,vpn_server1_firewall,vpn_server1_sn,vpn_server1_nm,vpn_server1_local,vpn_server1_remote,vpn_server1_dhcp,vpn_server1_r1,vpn_server1_r2,vpn_server1_crypt,vpn_server1_comp,vpn_server1_cipher,vpn_server1_hmac,vpn_server1_ccd,vpn_server1_c2c,vpn_server1_ccd_excl,vpn_server1_ccd_val,vpn_server1_custom,vpn_server1_static,vpn_server1_ca,vpn_server1_crt,vpn_server1_key,vpn_server1_dh,vpn_server2_if,vpn_server2_proto,vpn_server2_port,vpn_server2_firewall,vpn_server2_sn,vpn_server2_nm,vpn_server2_local,vpn_server2_remote,vpn_server2_dhcp,vpn_server2_r1,vpn_server2_r2,vpn_server2_crypt,vpn_server2_comp,vpn_server2_cipher,vpn_server2_hmac,vpn_server2_ccd,vpn_server2_c2c,vpn_server2_ccd_excl,vpn_server2_ccd_val,vpn_server2_custom,vpn_server2_static,vpn_server2_ca,vpn_server2_crt,vpn_server2_key,vpn_server2_dh"); %>
+//	<% nvram("vpn_server_eas,vpn_server1_if,vpn_server1_proto,vpn_server1_port,vpn_server1_firewall,vpn_server1_sn,vpn_server1_nm,vpn_server1_local,vpn_server1_remote,vpn_server1_dhcp,vpn_server1_r1,vpn_server1_r2,vpn_server1_crypt,vpn_server1_comp,vpn_server1_cipher,vpn_server1_hmac,vpn_server1_ccd,vpn_server1_c2c,vpn_server1_ccd_excl,vpn_server1_ccd_val,vpn_server1_custom,vpn_server1_static,vpn_server1_ca,vpn_server1_crt,vpn_server1_key,vpn_server1_dh,vpn_server2_if,vpn_server2_proto,vpn_server2_port,vpn_server2_firewall,vpn_server2_sn,vpn_server2_nm,vpn_server2_local,vpn_server2_remote,vpn_server2_dhcp,vpn_server2_r1,vpn_server2_r2,vpn_server2_crypt,vpn_server2_comp,vpn_server2_cipher,vpn_server2_hmac,vpn_server2_ccd,vpn_server2_c2c,vpn_server2_ccd_excl,vpn_server2_ccd_val,vpn_server2_custom,vpn_server2_static,vpn_server2_ca,vpn_server2_crt,vpn_server2_key,vpn_server2_dh"); %>
 
 function CCDGrid() { return this; }
 CCDGrid.prototype = new TomatoGrid;
@@ -317,12 +317,17 @@ function save()
 
 	var fom = E('_fom');
 
+	E('vpn_server_eas').value = '';
+
 	for (i = 0; i < tabs.length; ++i)
 	{
 		if (ccdTables[i].isEditing()) return;
 
 		t = tabs[i][0];
 
+		if ( E('_f_vpn_'+t+'_eas').checked )
+			E('vpn_server_eas').value += ''+(i+1)+',';
+
 		var data = ccdTables[i].getAllData();
 		var ccd = '';
 
@@ -410,6 +415,7 @@ table.status-table
 <input type='hidden' name='_nextpage' value='vpn-server.asp'>
 <input type='hidden' name='_nextwait' value='5'>
 <input type='hidden' name='_service' value=''>
+<input type='hidden' name='vpn_server_eas' id='vpn_server_eas' value=''>
 
 <div class='section-title'>VPN Server Configuration</div>
 <div class='section'>
@@ -435,6 +441,7 @@ for (i = 0; i < tabs.length; ++i)
 
 	W('<div id=\''+t+'-basic\'>');
 	createFieldTable('', [
+		{ title: 'Start with Router', name: 'f_vpn_'+t+'_eas', type: 'checkbox', value: nvram.vpn_server_eas.indexOf(''+(i+1)) >= 0 },
 		{ title: 'Interface Type', name: 'vpn_'+t+'_if', type: 'select', options: [ ['tap','TAP'], ['tun','TUN'] ], value: eval( 'nvram.vpn_'+t+'_if' ) },
 		{ title: 'Protocol', name: 'vpn_'+t+'_proto', type: 'select', options: [ ['udp','UDP'], ['tcp-server','TCP'] ], value: eval( 'nvram.vpn_'+t+'_proto' ) },
 		{ title: 'Port', name: 'vpn_'+t+'_port', type: 'text', value: eval( 'nvram.vpn_'+t+'_port' ) },
-- 
2.11.4.GIT