openvpn: Fix wrong default port number.

[people/teissler/ipfire-2.x.git] / src / scripts / connscheduler

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index 17dc629262f76049a3ef1ed0aa3ad933fb1dc321..bc4d4eb6562302b5fc60c2600604bf3226213e5a 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -63,6 +63,9 @@ exit 0;
 #
 sub hangup
 {
+  # Kill connectd if running to prevent redial
+  system('/bin/killall', 'connectd');
+
   unless ( -e "${General::swroot}/red/active" )
   {
     &General::log("ConnSched already disconnected");
@@ -70,17 +73,20 @@ sub hangup
   }
 
   &General::log("ConnSched disconnect");
-  unless ( system('/etc/rc.d/init.d/red', 'stop') == 0 )
+  unless ( system('/etc/rc.d/init.d/network', 'stop', 'red') == 0 )
   {
     &General::log("ConnSched disconnect failed: $?");
     return;
   }
 
   # now wait for active triggerfile and ppp daemon to disappear 
+  # wait maximum 60 seconds
+  my $counter = 60;
   sleep 1;
-  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' ) 
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) 
   {
     sleep 1;
+    $counter--;
   }
 }
 
@@ -94,7 +100,7 @@ sub dial
   }
 
   &General::log("ConnSched connect");
-  unless ( system('/etc/rc.d/init.d/red', 'start') == 0 )
+  unless ( system('/etc/rc.d/init.d/network', 'start', 'red') == 0 )
   {
     &General::log("ConnSched connect failed: $?");
     return;
@@ -113,6 +119,15 @@ sub dial
 sub reconnect
 {
   &hangup() if ( -e "${General::swroot}/red/active" );
+  # now wait for active triggerfile and ppp daemon to disappear
+  # wait maximum 60 seconds
+  my $counter = 60;
+  sleep 1;
+  while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) 
+  {
+    sleep 1;
+    $counter--;
+  }
   &dial();
 }
 
@@ -146,7 +161,7 @@ sub profile
   # Method to change Profile from pppsetup.cgi
        unlink("${General::swroot}/ppp/settings");
        link("${General::swroot}/ppp/settings-$profile", "${General::swroot}/ppp/settings");
-       system ("/bin/touch", "${General::swroot}/ppp/updatesettings");
+       system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
 
   if ( $restart_red == 1 )
   {