Changeset e248cf2 for npl

Timestamp:

10/26/17 16:50:04 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

d6ed36a

Parents:

9684832

Message:

dont allow multiple tunnels between same hosts because of shared key issues

Location:

npl/syn3/webint/src/vpn

Files:

• edittunnel.php (modified) (1 diff)
• lang_de.php (modified) (1 diff)
• lang_deD.php (modified) (1 diff)
• lang_en.php (modified) (1 diff)
• lang_enD.php (modified) (1 diff)
• lang_nl.php (modified) (1 diff)
• lang_nlD.php (modified) (1 diff)
• lang_pl.php (modified) (1 diff)
• lang_plD.php (modified) (1 diff)
• lang_pt.php (modified) (1 diff)
• lang_ptD.php (modified) (1 diff)

npl/syn3/webint/src/vpn/edittunnel.php

@@ -99 +99 @@
         elseif ($new_leftsourceip && !ValidIp($new_leftsourceip))
                 $errors[new_leftsourceip]=_EnterValidIp();
+        else {
+                $tunnels=vpn_ReadTunnels();
+                foreach ($tunnels as $name=>$data)
+                {
+                        if (($name != $new_name) && ($data[leftid]==$new_leftid) && ($data[right]==$new_right))
+                        {
+                                $errors[new_leftid]=_TunnelAlreadyExistsBetweenHosts($name);
+                                break;
+                        }
+                }
+        }
 
 

npl/syn3/webint/src/vpn/lang_de.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
         "Fehler beim Deaktivieren des Tunnels $a: $b"

npl/syn3/webint/src/vpn/lang_deD.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=de&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Fehler beim Deaktivieren des Tunnels $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4301");return (
         "Fehler beim Deaktivieren des Tunnels $a: $b"

npl/syn3/webint/src/vpn/lang_en.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
         "Error while disabling tunnel $a: $b"

npl/syn3/webint/src/vpn/lang_enD.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8326");return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Error while disabling tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=1387");return (
         "Error while disabling tunnel $a: $b"

npl/syn3/webint/src/vpn/lang_nl.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+        "Tunnel $a bestaat al tussen deze twee IP adressen."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
         "Probleem tijdens het uitschakellen van tunnel $a: $b"

npl/syn3/webint/src/vpn/lang_nlD.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a bestaat al tussen deze twee IP adressen.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=8327");return (
+        "Tunnel $a bestaat al tussen deze twee IP adressen."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Probleem tijdens het uitschakellen van tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=423");return (
         "Probleem tijdens het uitschakellen van tunnel $a: $b"

npl/syn3/webint/src/vpn/lang_pl.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
         "Bład podczas wyłączania tunelu $a: $b"

npl/syn3/webint/src/vpn/lang_plD.php

@@ -238 +238 @@
 function _ThisSide($a='',$b='') { LangDebug("Ustawienia \'tutaj\'", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?edit_ID=4726");return (
         "Ustawienia 'tutaj'"
+);}
+
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pl&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+        "Tunnel $a already exists between these IP adresses."
 );}
 

npl/syn3/webint/src/vpn/lang_pt.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { return (
         "Error while disabling tunnel $a: $b"

npl/syn3/webint/src/vpn/lang_ptD.php

@@ -240 +240 @@
 );}
 
+function _TunnelAlreadyExistsBetweenHosts($a="",$b="",$c="",$d="") { LangDebug("Tunnel $a already exists between these IP adresses.", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_TunnelAlreadyExistsBetweenHosts");return (
+        "Tunnel $a already exists between these IP adresses."
+);}
+
 function _TunnelDownError($a='',$b='') { LangDebug("Error while disabling tunnel $a: $b", "http://www.syn-3.nl/mosaddphp/translate/editlang.php?src_lang=en&add_langID=pt&add_labelID=_TunnelDownError");return (
         "Error while disabling tunnel $a: $b"