This module is responsible for start stop of the vpn system.
1) it allows AH & ESP to get in from interface where a vpn is mounted
- The NAT traversal is used on the udp 4500 port.
+ The NAT traversal is used on the udp 4500 port.
2) it starts the ipsec daemon
- The RED interface is a problem because it can be up or down a startup.
- Then, the state change and it must not affect other VPN mounted on
- other interface.
- Unfortunatly, openswan 1 cannot do that correctly. It cannot use an
- interface without restarting everything.
-
- IPCop should control vpn this way:
-
- rc.netaddrsesup.up
- call ipsecctrl once to start vpns on all interface
- RED based vpn won't start because "auto=ignore" instead off "auto=start"
-
- rc.updatered
- call ipsectrl to turn on or off vpn based on RED
-
- but now it is only:
-
- rc.updatered
- call ipsectrl S at every event on RED.
- Consequence: BLUE vpn is not started until RED goes up.
-
+ The RED interface is a problem because it can be up or down a startup.
+ Then, the state change and it must not affect other VPN mounted on
+ other interface.
+ Unfortunatly, openswan 1 cannot do that correctly. It cannot use an
+ interface without restarting everything.
*/
-#define phystable "IPSECPHYSICAL"
-#define virtualtable "IPSECVIRTUAL"
-
void usage() {
- fprintf (stderr, "Usage:\n");
- fprintf (stderr, "\tipsecctrl S [connectionkey]\n");
- fprintf (stderr, "\tipsecctrl D [connectionkey]\n");
- fprintf (stderr, "\tipsecctrl R\n");
- fprintf (stderr, "\t\tS : Start/Restart Connection\n");
- fprintf (stderr, "\t\tD : Stop Connection\n");
- fprintf (stderr, "\t\tR : Reload Certificates and Secrets\n");
-}
-
-void load_modules() {
- safe_system("/sbin/modprobe ipsec");
+ fprintf (stderr, "Usage:\n");
+ fprintf (stderr, "\tipsecctrl S [connectionkey]\n");
+ fprintf (stderr, "\tipsecctrl D [connectionkey]\n");
+ fprintf (stderr, "\tipsecctrl R\n");
+ fprintf (stderr, "\tipsecctrl I\n");
+ fprintf (stderr, "\t\tS : Start/Restart Connection\n");
+ fprintf (stderr, "\t\tD : Stop Connection\n");
+ fprintf (stderr, "\t\tR : Reload Certificates and Secrets\n");
+ fprintf (stderr, "\t\tI : Print Statusinfo\n");
}
/*
- ACCEPT the ipsec protocol ah, esp & udp (for nat traversal) on the specified interface
+ 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 -A " phystable " -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface);
- safe_system(str);
-
- if (! nat_traversal_port)
- return;
-
- sprintf(str, "/sbin/iptables -A " phystable " -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port);
- safe_system(str);
-}
-
-/*
- Basic control for what can flow from/to ipsecX interfaces.
-
- rc.firewall call this chain just before ACCEPTing everything
- from green (-i DEV_GREEN -j ACCEPT).
-*/
-void open_virtual (void) {
- // allow anything from any ipsec to go on all interface, including other ipsec
- safe_system("/sbin/iptables -A " virtualtable " -i ipsec+ -j ACCEPT");
- //todo: BOT extension?; allowing ipsec0<<==port-list-filter==>>GREEN ?
+ 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 --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
+ safe_system(str);
+ sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --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);
+ safe_system(str);
+ sprintf(str, "/sbin/iptables -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 " phystable);
- safe_system("/sbin/iptables -F " virtualtable);
+ /* clear input rules */
+ safe_system("/sbin/iptables -F IPSECINPUT");
+ safe_system("/sbin/iptables -F IPSECFORWARD");
+ safe_system("/sbin/iptables -F IPSECOUTPUT");
- // unmap red alias ????
-}
-
-
-void add_alias_interfaces(char *configtype,
- char *redtype,
- char *redif,
- int offset) //reserve room for ipsec0=red, ipsec1=green, ipsec2=orange,ipsec3=blue
-{
- FILE *file = NULL;
- char s[STRING_SIZE];
- int alias=0;
-
- /* Check for CONFIG_TYPE=2 or 3 i.e. RED ethernet present. If not,
- * exit gracefully. This is not an error... */
- if (!((strcmp(configtype, "1")==0) || (strcmp(configtype, "2")==0) || (strcmp(configtype, "3")==0) || (strcmp(configtype, "4")==0)))
- return;
-
- /* Now check the RED_TYPE - aliases only work with STATIC. */
- if (!(strcmp(redtype, "STATIC")==0))
- return;
-
- /* Now set up the new aliases from the config file */
- if (!(file = fopen(CONFIG_ROOT "/ethernet/aliases", "r")))
- {
- fprintf(stderr, "Unable to open aliases configuration file\n");
- return;
- }
- while (fgets(s, STRING_SIZE, file) != NULL && (offset+alias) < 16 )
- {
- if (s[strlen(s) - 1] == '\n')
- s[strlen(s) - 1] = '\0';
- int count = 0;
- char *aliasip=NULL;
- char *enabled=NULL;
- char *comment=NULL;
- char *sptr = strtok(s, ",");
- while (sptr)
- {
- if (count == 0)
- aliasip = sptr;
- if (count == 1)
- enabled = sptr;
- else
- comment = sptr;
- count++;
- sptr = strtok(NULL, ",");
- }
-
- if (!(aliasip && enabled))
- continue;
-
- if (!VALID_IP(aliasip))
- {
- fprintf(stderr, "Bad alias : %s\n", aliasip);
- return;
- }
-
- if (strcmp(enabled, "on") == 0)
- {
- memset(s, 0, STRING_SIZE);
- snprintf(s, STRING_SIZE-1, "/usr/sbin/ipsec tncfg --attach --virtual ipsec%d --physical %s:%d >/dev/null", offset+alias, redif, alias);
- safe_system(s);
- alias++;
- }
- }
}
/*
return values from the vpn config file or false if not 'on'
*/
int decode_line (char *s,
- char **key,
- char **name,
- char **type,
- char **interface
- ) {
- int count = 0;
- *key = NULL;
- *name = NULL;
- *type = NULL;
-
- if (s[strlen(s) - 1] == '\n')
- s[strlen(s) - 1] = '\0';
-
- char *result = strsep(&s, ",");
- while (result) {
- if (count == 0)
- *key = result;
- if ((count == 1) && strcmp(result, "on") != 0)
- return 0; // a disabled line
- if (count == 2)
- *name = result;
- if (count == 4)
- *type = result;
- if (count == 27)
- *interface = result;
- count++;
- result = strsep(&s, ",");
- }
-
- // check other syntax
- if (! *name)
- return 0;
-
- if (strspn(*name, LETTERS_NUMBERS) != strlen(*name)) {
- fprintf(stderr, "Bad connection name: %s\n", *name);
- return 0;
- }
-
- if (! (strcmp(*type, "host") == 0 || strcmp(*type, "net") == 0)) {
- fprintf(stderr, "Bad connection type: %s\n", *type);
- 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;
+ char **key,
+ char **name,
+ char **type,
+ char **interface
+ ) {
+ int count = 0;
+ *key = NULL;
+ *name = NULL;
+ *type = NULL;
+
+ if (s[strlen(s) - 1] == '\n')
+ s[strlen(s) - 1] = '\0';
+
+ char *result = strsep(&s, ",");
+ while (result) {
+ if (count == 0)
+ *key = result;
+ if ((count == 1) && strcmp(result, "on") != 0)
+ return 0; // a disabled line
+ if (count == 2)
+ *name = result;
+ if (count == 4)
+ *type = result;
+ if (count == 27)
+ *interface = result;
+ count++;
+ result = strsep(&s, ",");
+ }
+
+ // check other syntax
+ if (! *name)
+ return 0;
+
+ if (strspn(*name, LETTERS_NUMBERS) != strlen(*name)) {
+ fprintf(stderr, "Bad connection name: %s\n", *name);
+ return 0;
+ }
+
+ if (! (strcmp(*type, "host") == 0 || strcmp(*type, "net") == 0)) {
+ fprintf(stderr, "Bad connection type: %s\n", *type);
+ 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) {
- char command[STRING_SIZE];
-
- safe_system("/usr/sbin/ipsec auto --rereadsecrets >/dev/null");
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec auto --replace %s >/dev/null", name);
- safe_system(command);
- if (strcmp(type, "net") == 0) {
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec auto --asynchronous --up %s >/dev/null", name);
- safe_system(command);
- }
+/*
+ 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");
}
/*
issue ipsec commmands to turn off connection 'name'
*/
void turn_connection_off (char *name) {
- char command[STRING_SIZE];
-
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec auto --down %s >/dev/null", name);
- safe_system(command);
- memset(command, 0, STRING_SIZE);
- snprintf(command, STRING_SIZE - 1,
- "/usr/sbin/ipsec auto --delete %s >/dev/null", name);
- safe_system(command);
- safe_system("/usr/sbin/ipsec auto --rereadsecrets >/dev/null");
+ 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);
+ safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
}
int main(int argc, char *argv[]) {
- char configtype[STRING_SIZE];
- char redtype[STRING_SIZE] = "";
- struct keyvalue *kv = NULL;
-
- if (argc < 2) {
- usage();
- exit(1);
- }
- if (!(initsetuid()))
- exit(1);
-
+ char configtype[STRING_SIZE];
+ char redtype[STRING_SIZE] = "";
+ struct keyvalue *kv = NULL;
+
+ if (argc < 2) {
+ usage();
+ exit(1);
+ }
+ if (!(initsetuid()))
+ exit(1);
+
FILE *file = NULL;
-
- /* Get vpnwatch pid */
+
- if (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) {
- ipsec_norules();
- /* Only shutdown pluto if it really is running */
- int fd;
- /* Get pluto pid */
- if ((fd = open("/var/run/pluto.pid", O_RDONLY)) != -1) {
- safe_system("/etc/rc.d/init.d/ipsec stop 2> /dev/null >/dev/null");
- close(fd);
- }
- exit(0);
- }
-
- if (strcmp(argv[1], "R") == 0) {
- safe_system("/usr/sbin/ipsec auto --rereadall");
- exit(0);
- }
- }
+ if (strcmp(argv[1], "I") == 0) {
+ safe_system("/usr/sbin/ipsec whack --status");
+ safe_system("/usr/sbin/ipsec stroke status");
+ exit(0);
+ }
- /* clear iptables vpn rules */
- ipsec_norules();
+ if (strcmp(argv[1], "R") == 0) {
+ safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
+ safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null");
+ exit(0);
+ }
- /* read vpn config */
- kv=initkeyvalues();
- if (!readkeyvalues(kv, CONFIG_ROOT "/vpn/settings"))
- {
- fprintf(stderr, "Cannot read vpn settings\n");
- exit(1);
- }
+ /* Get vpnwatch pid */
- /* check is the vpn system is enabled */
- {
- char s[STRING_SIZE];
- findkey(kv, "ENABLED", s);
- freekeyvalues(kv);
- if (strcmp (s, "on") != 0)
- exit(0);
- }
- /* read interface settings */
- kv=initkeyvalues();
- if (!readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings"))
- {
- fprintf(stderr, "Cannot read ethernet settings\n");
- exit(1);
- }
- if (!findkey(kv, "CONFIG_TYPE", configtype))
- {
- fprintf(stderr, "Cannot read CONFIG_TYPE\n");
- exit(1);
- }
- findkey(kv, "RED_TYPE", redtype);
-
-
- /* Loop through the config file to find physical interface that will accept IPSEC */
- int enable_red=0; // states 0: not used
- int enable_green=0; // 1: error condition
- int enable_orange=0; // 2: good
- int enable_blue=0;
- char if_red[STRING_SIZE] = "";
- char if_green[STRING_SIZE] = "";
- char if_orange[STRING_SIZE] = "";
- 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);
+ 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);
}
- 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
- }
- }
-
- 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 (!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");
- }
-
- 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");
-
- }
- }
- fclose(file);
- freekeyvalues(kv);
-
- // do nothing if something is in error condition
- if ((enable_red==1) || (enable_green==1) || (enable_orange==1) || (enable_blue==1) )
- exit(1);
-
- // exit if nothing to do
- 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)
- open_physical(if_red, 4500);
-
- if (enable_green==2)
- open_physical(if_green, 4500);
-
- if (enable_orange==2)
- open_physical(if_orange, 4500);
-
- if (enable_blue==2)
- open_physical(if_blue, 4500);
-
- // then open the ipsecX
- open_virtual();
-
- // start the system
- if ((argc == 2) && strcmp(argv[1], "S") == 0) {
- load_modules();
- safe_system("/usr/sbin/ipsec tncfg --clear >/dev/null");
+
+ /* 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);
+ }
+ ipsec_norules();
+ exit(0);
+ }
+
+ }
+
+ /* read vpn config */
+ kv=initkeyvalues();
+ if (!readkeyvalues(kv, CONFIG_ROOT "/vpn/settings"))
+ {
+ fprintf(stderr, "Cannot read vpn settings\n");
+ exit(1);
+ }
+
+ /* check is the vpn system is enabled */
+ {
+ char s[STRING_SIZE];
+ findkey(kv, "ENABLED", s);
+ freekeyvalues(kv);
+ if (strcmp (s, "on") != 0)
+ exit(0);
+ }
+
+ /* read interface settings */
+ kv=initkeyvalues();
+ if (!readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings"))
+ {
+ fprintf(stderr, "Cannot read ethernet settings\n");
+ exit(1);
+ }
+ if (!findkey(kv, "CONFIG_TYPE", configtype))
+ {
+ fprintf(stderr, "Cannot read CONFIG_TYPE\n");
+ exit(1);
+ }
+ findkey(kv, "RED_TYPE", redtype);
+
+
+ /* Loop through the config file to find physical interface that will accept IPSEC */
+ int enable_red=0; // states 0: not used
+ int enable_green=0; // 1: error condition
+ int enable_orange=0; // 2: good
+ int enable_blue=0;
+ char if_red[STRING_SIZE] = "";
+ char if_green[STRING_SIZE] = "";
+ char if_orange[STRING_SIZE] = "";
+ 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
+ }
+ }
+
+ 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 (!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");
+ }
+
+ 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");
+
+ }
+ }
+ fclose(file);
+ freekeyvalues(kv);
+
+ // do nothing if something is in error condition
+ if ((enable_red==1) || (enable_green==1) || (enable_orange==1) || (enable_blue==1) )
+ exit(1);
+
+ // exit if nothing to do
+ 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)
+ open_physical(if_red, 4500);
+
+ if (enable_green==2)
+ open_physical(if_green, 4500);
+
+ if (enable_orange==2)
+ open_physical(if_orange, 4500);
+
+ if (enable_blue==2)
+ 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");
- add_alias_interfaces(configtype, redtype, if_red, (enable_red+enable_green+enable_orange+enable_blue) >>1 );
- 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])) {
- ipsec_norules();
- fprintf(stderr, "Bad arg\n");
- usage();
- exit(1);
- }
-
- // search the vpn pointed by 'key'
- if (!(file = fopen(CONFIG_ROOT "/vpn/config", "r"))) {
- ipsec_norules();
- 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;
-
- // 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)
- turn_connection_off (name);
- else {
- ipsec_norules();
- fprintf(stderr, "Bad command\n");
- exit(1);
- }
- }
- fclose(file);
- safe_system("/usr/local/bin/vpn-watch &");
- return 0;
+ safe_system("/usr/local/bin/vpn-watch &");
+ 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");
+ usage();
+ exit(1);
+ }
+
+ // search the vpn pointed by 'key'
+ 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;
+
+ // 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)
+ turn_connection_off (name);
+ else {
+ fprintf(stderr, "Bad command\n");
+ exit(1);
+ }
+ }
+ fclose(file);
+ return 0;
}
projects / people / pmueller / ipfire-2.x.git / blobdiff