Und wieder ein commit da ich heute so fleissig bin :D

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@690 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 103cf55a5dfbf3aef4178accee4b55eb002a0545..659c8c2c81b1720746bdccb812b74a39cb04e178 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -955,8 +955,14 @@ sub initprofile
        $pppsettings{'PHONEBOOK'} = 'RELAY_PPP1';
        $pppsettings{'PROTOCOL'} = 'RFC2364';
        $pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
+       if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ){
        $pppsettings{'MTU'} = '1492';
        $pppsettings{'MRU'} = '1492';
+  }
+  else{
+  $pppsettings{'MTU'} = '1452';
+       $pppsettings{'MRU'} = '1452';
+  }
        $pppsettings{'DIALMODE'} = 'T';
        $pppsettings{'MAXRETRIES'} = 5;
        $pppsettings{'HOLDOFF'} = 30;

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index e510641a84d614cf347ef4fec4d43072d5a6aae8..462c6c3164b0cf2df4d89b14281cd1720db51d1b 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -22,13 +22,12 @@ if ( -e $file ){
     close(FILE);
     system("kill -9 $PID");
   }
-if ($debug){logger("Call of vpn-watch pid not is not existing.");}
 
 system("echo $$ > $file");
     
 while ( $i == 0){
- sleep(300);
   if ($debug){logger("We will wait 300 seconds before next action.");}
+    sleep(300);
   
   if (open(FILE, "<${General::swroot}/vpn/config")) {
     @vpnsettings = <FILE>;
@@ -50,10 +49,10 @@ foreach (@vpnsettings){
   
   my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip);
   if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
-  my $connected=system("ipsec whack --status | grep $remoteip >/dev/null");
-  my $established=system("ipsec whack --status | grep '$settings[1]' | grep 'ISAKMP SA established' >/dev/null"); 
+  my $connected= `ipsec whack --status | grep $remoteip`;
+  my $established= `ipsec whack --status | grep '$settings[2]' | grep 'ISAKMP SA established'`; 
   
-  if ( $established  eq "" || $connected eq "" ){
+  if ( $established  eq '' || $connected eq '' ){
     logger("Remote IP for host $remotehostname has changed or no connection is established, restarting connection to $remoteip.");
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     next;