#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
+
#include "setuid.h"
+#include "netutil.h"
/*
This module is responsible for start stop of the vpn system.
fprintf (stderr, "\t\tI : Print Statusinfo\n");
}
+static void ipsec_reload() {
+ /* Re-read all configuration files and secrets and
+ * reload the daemon (#10339).
+ */
+ safe_system("/usr/sbin/ipsec rereadall >/dev/null 2>&1");
+ safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
+}
+
/*
ACCEPT the ipsec protocol ah, esp & udp (for nat traversal) on the specified interface
*/
void open_physical (char *interface, int nat_traversal_port) {
char str[STRING_SIZE];
- // GRE ???
-// sprintf(str, "/sbin/iptables -A " phystable " -p 47 -i %s -j ACCEPT", interface);
-// safe_system(str);
- // ESP
-// sprintf(str, "/sbin/iptables -A " phystable " -p 50 -i %s -j ACCEPT", interface);
-// safe_system(str);
- // AH
-// sprintf(str, "/sbin/iptables -A " phystable " -p 51 -i %s -j ACCEPT", interface);
-// safe_system(str);
// IKE
-
- sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
+ sprintf(str, "/sbin/iptables --wait -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
safe_system(str);
- sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface);
+ sprintf(str, "/sbin/iptables --wait -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface);
safe_system(str);
if (! nat_traversal_port)
return;
- sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport %i -j ACCEPT >/dev/null 2>&1", interface, nat_traversal_port);
+ sprintf(str, "/sbin/iptables --wait -D IPSECINPUT -p udp -i %s --dport %i -j ACCEPT >/dev/null 2>&1", interface, nat_traversal_port);
safe_system(str);
- sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port);
+ sprintf(str, "/sbin/iptables --wait -A IPSECINPUT -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port);
safe_system(str);
}
void ipsec_norules() {
/* clear input rules */
- safe_system("/sbin/iptables -F IPSECINPUT");
- safe_system("/sbin/iptables -F IPSECFORWARD");
- safe_system("/sbin/iptables -F IPSECOUTPUT");
-
+ safe_system("/sbin/iptables --wait -F IPSECINPUT");
+ safe_system("/sbin/iptables --wait -F IPSECFORWARD");
+ safe_system("/sbin/iptables --wait -F IPSECOUTPUT");
}
/*
int decode_line (char *s,
char **key,
char **name,
- char **type,
- char **interface
+ char **type
) {
int count = 0;
*key = NULL;
*name = result;
if (count == 4)
*type = result;
- if (count == 27)
- *interface = result;
count++;
result = strsep(&s, ",");
}
return 0;
}
- if (! (strcmp(*interface, "RED") == 0 || strcmp(*interface, "GREEN") == 0 ||
- strcmp(*interface, "ORANGE") == 0 || strcmp(*interface, "BLUE") == 0)) {
- fprintf(stderr, "Bad interface name: %s\n", *interface);
- return 0;
- }
//it's a valid & active line
return 1;
}
/*
issue ipsec commmands to turn on connection 'name'
*/
-void turn_connection_on (char *name, char *type) {
-/*
- if you find a way to start a single connection without changing all add it
- here. Change also vpn-watch.
-*/
- safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
+void turn_connection_on(char *name, char *type) {
+ /*
+ * To bring up a connection, we need to reload the configuration
+ * and issue ipsec up afterwards. To make sure the connection
+ * is not established from the start, we bring it down in advance.
+ */
+ char command[STRING_SIZE];
+
+ // Bring down the connection (if established).
+ snprintf(command, STRING_SIZE - 1,
+ "/usr/sbin/ipsec down %s >/dev/null", name);
+ safe_system(command);
+
+ // Reload the configuration into the daemon (#10339).
+ ipsec_reload();
+
+ // Bring the connection up again.
+ snprintf(command, STRING_SIZE - 1,
+ "/usr/sbin/ipsec up %s >/dev/null", name);
+ safe_system(command);
}
+
/*
issue ipsec commmands to turn off connection 'name'
*/
void turn_connection_off (char *name) {
+ /*
+ * To turn off a connection, all SAs must be turned down.
+ * After that, the configuration must be reloaded.
+ */
char command[STRING_SIZE];
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name);
- safe_system(command);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec stroke down %s >/dev/null", name);
- safe_system(command);
+
+ // Bring down the connection.
snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec stroke delete %s >/dev/null", name);
+ "/usr/sbin/ipsec down %s >/dev/null", name);
safe_system(command);
- safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
- safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null");
+ // Reload, so the connection is dropped.
+ ipsec_reload();
}
-
int main(int argc, char *argv[]) {
-
char configtype[STRING_SIZE];
char redtype[STRING_SIZE] = "";
struct keyvalue *kv = NULL;
if (strcmp(argv[1], "I") == 0) {
- safe_system("/usr/sbin/ipsec whack --status");
- safe_system("/usr/sbin/ipsec stroke status");
+ safe_system("/usr/sbin/ipsec status");
exit(0);
}
if (strcmp(argv[1], "R") == 0) {
- safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
- safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null");
+ ipsec_reload();
exit(0);
}
- /* Get vpnwatch pid */
-
-
- if ((argc == 2) && (file = fopen("/var/run/vpn-watch.pid", "r"))) {
- safe_system("kill -9 $(cat /var/run/vpn-watch.pid)");
- safe_system("unlink /var/run/vpn-watch.pid");
- close(file);
- }
-
/* FIXME: workaround for pclose() issue - still no real idea why
* this is happening */
signal(SIGCHLD, SIG_DFL);
/* handle operations that doesn't need start the ipsec system */
if (argc == 2) {
if (strcmp(argv[1], "D") == 0) {
- /* Only shutdown pluto if it really is running */
- /* Get pluto pid */
- if (file = fopen("/var/run/pluto.pid", "r")) {
- safe_system("/etc/rc.d/init.d/ipsec stop 2> /dev/null >/dev/null");
- close(file);
- }
+ safe_system("/usr/sbin/ipsec stop >/dev/null 2>&1");
ipsec_norules();
exit(0);
}
-
}
/* read vpn config */
char if_blue[STRING_SIZE] = "";
char s[STRING_SIZE];
- if (!(file = fopen(CONFIG_ROOT "/vpn/config", "r"))) {
- fprintf(stderr, "Couldn't open vpn settings file");
- exit(1);
- }
- while (fgets(s, STRING_SIZE, file) != NULL) {
- char *key;
- char *name;
- char *type;
- char *interface;
- if (!decode_line(s,&key,&name,&type,&interface))
- continue;
- /* search interface */
- if (!enable_red && strcmp (interface, "RED") == 0) {
- // when RED is up, find interface name in special file
- FILE *ifacefile = NULL;
- if ((ifacefile = fopen(CONFIG_ROOT "/red/iface", "r"))) {
- if (fgets(if_red, STRING_SIZE, ifacefile)) {
- if (if_red[strlen(if_red) - 1] == '\n')
- if_red[strlen(if_red) - 1] = '\0';
- }
- fclose (ifacefile);
-
- if (VALID_DEVICE(if_red))
- enable_red+=2; // present and running
- }
+ // when RED is up, find interface name in special file
+ FILE *ifacefile = NULL;
+ if ((ifacefile = fopen(CONFIG_ROOT "/red/iface", "r"))) {
+ if (fgets(if_red, STRING_SIZE, ifacefile)) {
+ if (if_red[strlen(if_red) - 1] == '\n')
+ if_red[strlen(if_red) - 1] = '\0';
}
+ fclose (ifacefile);
- if (!enable_green && strcmp (interface, "GREEN") == 0) {
- enable_green = 1;
- findkey(kv, "GREEN_DEV", if_green);
- if (VALID_DEVICE(if_green))
- enable_green++;
- else
- fprintf(stderr, "IPSec enabled on green but green interface is invalid or not found\n");
- }
+ if (VALID_DEVICE(if_red))
+ enable_red++;
+ }
- if (!enable_orange && strcmp (interface, "ORANGE") == 0) {
- enable_orange = 1;
- findkey(kv, "ORANGE_DEV", if_orange);
- if (VALID_DEVICE(if_orange))
- enable_orange++;
- else
- fprintf(stderr, "IPSec enabled on orange but orange interface is invalid or not found\n");
- }
+ // Check if GREEN is enabled.
+ findkey(kv, "GREEN_DEV", if_green);
+ if (VALID_DEVICE(if_green))
+ enable_green++;
- if (!enable_blue && strcmp (interface, "BLUE") == 0) {
- enable_blue++;
- findkey(kv, "BLUE_DEV", if_blue);
- if (VALID_DEVICE(if_blue))
- enable_blue++;
- else
- fprintf(stderr, "IPSec enabled on blue but blue interface is invalid or not found\n");
+ // Check if ORANGE is enabled.
+ findkey(kv, "ORANGE_DEV", if_orange);
+ if (VALID_DEVICE(if_orange))
+ enable_orange++;
- }
- }
- fclose(file);
- freekeyvalues(kv);
+ // Check if BLUE is enabled.
+ findkey(kv, "BLUE_DEV", if_blue);
+ if (VALID_DEVICE(if_blue))
+ enable_blue++;
- // do nothing if something is in error condition
- if ((enable_red==1) || (enable_green==1) || (enable_orange==1) || (enable_blue==1) )
- exit(1);
+ freekeyvalues(kv);
// exit if nothing to do
- if ( (enable_red+enable_green+enable_orange+enable_blue) == 0 )
+ if ((enable_red+enable_green+enable_orange+enable_blue) == 0)
exit(0);
// open needed ports
- // todo: read a nat_t indicator to allow or not openning UDP/4500
- if (enable_red==2)
+ if (enable_red > 0)
open_physical(if_red, 4500);
- if (enable_green==2)
+ if (enable_green > 0)
open_physical(if_green, 4500);
- if (enable_orange==2)
+ if (enable_orange > 0)
open_physical(if_orange, 4500);
- if (enable_blue==2)
+ if (enable_blue > 0)
open_physical(if_blue, 4500);
// start the system
if ((argc == 2) && strcmp(argv[1], "S") == 0) {
- safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
- safe_system("/usr/local/bin/vpn-watch &");
+ safe_system("/usr/sbin/ipsec restart >/dev/null");
exit(0);
}
// it is a selective start or stop
// second param is only a number 'key'
if ((argc == 2) || strspn(argv[2], NUMBERS) != strlen(argv[2])) {
- fprintf(stderr, "Bad arg\n");
+ fprintf(stderr, "Bad arg: %s\n", argv[2]);
usage();
exit(1);
}
char *key;
char *name;
char *type;
- char *interface;
- if (!decode_line(s,&key,&name,&type,&interface))
+ if (!decode_line(s,&key,&name,&type))
continue;
- // start/stop a vpn if belonging to specified interface
- if (strcmp(argv[1], interface) == 0 ) {
- if (strcmp(argv[2], "0")==0)
- turn_connection_off (name);
- else
- turn_connection_on (name, type);
- continue;
- }
// is it the 'key' requested ?
if (strcmp(argv[2], key) != 0)
continue;
+
// Start or Delete this Connection
if (strcmp(argv[1], "S") == 0)
turn_connection_on (name, type);
- else
- if (strcmp(argv[1], "D") == 0)
+ else if (strcmp(argv[1], "D") == 0)
turn_connection_off (name);
else {
fprintf(stderr, "Bad command\n");
}
}
fclose(file);
+
return 0;
}
projects / ipfire-2.x.git / blobdiff