IPsec: Show status in WUI when VPN is connecting

This is helpful when debugging on-demand connections
when you can see if strongswan tries to connect or is
still idle.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-20 13:00:42 +01:00
parent c94d1976d3
commit 1fab4edfa6
12 changed files with 19 additions and 0 deletions

View File

@@ -1144,6 +1144,7 @@ WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: vpn on-demand

View File

@@ -1161,6 +1161,7 @@ WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: vpn on-demand

View File

@@ -820,6 +820,7 @@ WARNING: untranslated string: unblock
WARNING: untranslated string: unblock all
WARNING: untranslated string: uncheck all
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn on-demand
WARNING: untranslated string: vpn start action

View File

@@ -868,6 +868,7 @@ WARNING: untranslated string: uncheck all
WARNING: untranslated string: upload dh key
WARNING: untranslated string: vendor
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn on-demand
WARNING: untranslated string: vpn start action

View File

@@ -1144,6 +1144,7 @@ WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: vpn on-demand

View File

@@ -1139,6 +1139,7 @@ WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn force mobike
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: vpn on-demand

View File

@@ -754,6 +754,7 @@ WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: vpn broken
WARNING: untranslated string: vpn connecting
WARNING: untranslated string: vpn on-demand
WARNING: untranslated string: vpn start action
WARNING: untranslated string: vpn start action route

View File

@@ -562,6 +562,7 @@
< vendor
< visit us at
< vpn broken
< vpn connecting
< vpn keyexchange
< vpn on-demand
< vpn start action
@@ -1183,6 +1184,7 @@
< vendor
< visit us at
< vpn broken
< vpn connecting
< vpn keyexchange
< vpn on-demand
< vpn start action
@@ -1769,6 +1771,7 @@
< vendor
< visit us at
< vpn broken
< vpn connecting
< vpn keyexchange
< vpn on-demand
< vpn start action
@@ -2360,6 +2363,7 @@
< vendor
< visit us at
< vpn broken
< vpn connecting
< vpn keyexchange
< vpn on-demand
< vpn start action

View File

@@ -425,6 +425,9 @@ END
if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
$activecolor = $Header::colourgreen;
$activestatus = $Lang::tr{'capsopen'};
} elsif ($line =~ /$vpnconfig{$key}[1]\[.*CONNECTING/) {
$activecolor = $Header::colourorange;
$activestatus = $Lang::tr{'vpn connecting'};
} elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
$activecolor = $Header::colourorange;
$activestatus = $Lang::tr{'vpn on-demand'};

View File

@@ -2808,6 +2808,9 @@ END
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
$col1="bgcolor='${Header::colourgreen}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
} elsif ($line =~ /$confighash{$key}[1]\[.*CONNECTING/) {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>";
} elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";

View File

@@ -2606,6 +2606,7 @@
'vpn altname syntax' => 'Der Subjekt Alternativ Name ist eine durch Komma getrennte Liste von Email, DNS, URI, RID und IP Objekten. <br />Email: eine Email Adresse. Syntax Email: \'copy\' benutzt die Email Adresse aus dem Zertifikatfeld. <br />DNS: ein gültiger Domain Name.<br />URI: eine gültige URI.<br />RID: Registriertes Objekt Identifikation.<br />IP: eine IP Adresse.<br />Bitte beachten: der Zeichensatz ist eingeschränkt und die Groß-/Kleinschreibung ist entscheidend.<br />Beispiel:<br /><b>email:</b>info@ipfire.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/nach/irgendwo',
'vpn auth-dn' => 'Peer wird identifiziert durch entweder ein IPV4_ADDR, FQDN, USER_FQDN oder DER_ASN1_DN string in Remote ID Feld',
'vpn broken' => 'Gebrochen',
'vpn connecting' => 'VERBINDUNGSAUFBAU',
'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)',
'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',

View File

@@ -2650,6 +2650,7 @@
'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
'vpn broken' => 'Broken',
'vpn configuration main' => 'VPN Configuration',
'vpn connecting' => 'CONNECTING',
'vpn delayed start' => 'Delay before launching VPN (seconds)',
'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
'vpn force mobike' => 'Force using MOBIKE (only IKEv2)',