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>

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 48afe09bb0f8e90cd103b393d4667e0138cb1d1f..09dae68d4cb8d2103d152f553a3b89d18e9b4cc8 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -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

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index a048e983a553fe0253de5ad325c71f21c45b9b99..1f4f9c35799fbb78eff973896e60a8692921f8e4 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -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

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 077ab75e1ff94879b81a99ccc267e4334f791934..6b5639c0fd3ebd2c1b464f648e43f70e3d1ff524 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -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

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c27d5e7646779b7529e304f50fcaa955b3082552..30744829da60efb9c106e92cdfcc3cd7c8bbcc7e 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -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

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 48afe09bb0f8e90cd103b393d4667e0138cb1d1f..09dae68d4cb8d2103d152f553a3b89d18e9b4cc8 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -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

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index c8595703d8a6ada8ce72c2f871aee5155057db34..f4944db94f003b83373b5d9c70d3ac46763c8912 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -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

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ad150abc2afe3a4eae4c154c715c63ceee07d815..ac7a82dc1cbd252d4bd57254ef8752c998002483 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -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

diff --git a/doc/language_missings b/doc/language_missings
index aaf0604106954113b38ffb9aa8be71ae5f3eff12..72fe0759419a2312f7bbfb81f59500ab961055fd 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -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

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 7c1746259d34bf653f86bd0033d801bfe3d09e09..80a86afb2178db670f0fc3640602e58b970d0baa 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -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'};

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 88159499b02404067accf1bf0a26385a7030c6ef..d3e4fe8f9ef3318ebd5f31be168a096d4e550c49 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -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>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0d6836b9a6c597ff7ac5b78f8a23990ef5464585..68d925d8c24f0ff40d9863b60473690f8d8684d1 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -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',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 925f665282cf8cd72c0e541a3008b37cbeb2e575..4f30f562dc85a1fc945c49f188d907e42f66c2c9 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -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)',