From 8057ab15b9efeecf8eca7ad4ebba170f141bd3de Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 15 Feb 2017 12:15:42 +0000 Subject: [PATCH] Show better connection information for on-demand IPsec connections Signed-off-by: Michael Tremer --- doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/index.cgi | 3 +++ html/cgi-bin/vpnmain.cgi | 3 +++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 19 insertions(+) diff --git a/doc/language_issues.es b/doc/language_issues.es index 36d4a8211a..def789e333 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1144,6 +1144,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b21c33851c..25ee84103f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1161,6 +1161,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.it b/doc/language_issues.it index e7230280f9..83268a3c73 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -819,6 +819,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 22a8934378..54653728d4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -867,6 +867,7 @@ WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 36d4a8211a..def789e333 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1144,6 +1144,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.ru b/doc/language_issues.ru index fc727d607a..3d2b356686 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1139,6 +1139,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 59c904657d..51ba00de4d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -752,6 +752,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_missings b/doc/language_missings index 49def615f3..acec27520d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -561,6 +561,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -1178,6 +1179,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -1760,6 +1762,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -2347,6 +2350,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index c142a65f7f..85a0c94cd9 100644 --- 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]\{.*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 972c07c13d..f4eccb1f0e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2805,6 +2805,9 @@ END ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { $col1="bgcolor='${Header::colourgreen}'"; $active = "$Lang::tr{'capsopen'}"; + } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) { + $col1="bgcolor='${Header::colourorange}'"; + $active = "$Lang::tr{'vpn on-demand'}"; } } # move to blue if really down diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 867bff7ebe..ad8db192bb 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2615,6 +2615,7 @@ 'vpn on blue' => 'VPN auf BLAU', 'vpn on green' => 'VPN auf GRÜN', 'vpn on orange' => 'VPN auf ORANGE', +'vpn on-demand' => 'ON DEMAND', 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5333c13b52..3deb4b555a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2660,6 +2660,7 @@ 'vpn on blue' => 'VPN on BLUE', 'vpn on green' => 'VPN on GREEN', 'vpn on orange' => 'VPN on ORANGE', +'vpn on-demand' => 'ON-DEMAND', 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', -- 2.39.2