Show better connection information for on-demand IPsec connections

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 36d4a8211a50dad7ae17368d5d3db02687675d08..def789e33305fd52156ead4b21f09bac72bd00e5 100644 (file)
--- 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 b21c33851c968322fdb2928b9752537fc6b8dc4c..25ee84103f87753a4b510e9c740431cc8d1d8f01 100644 (file)
--- 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 e7230280f90bbfaa7edeb91591cce6c8b898b4b2..83268a3c734c10e338aef9dbb47c0b13eb75a5cc 100644 (file)
--- 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 22a89343787e94decd3d4ee7728bca97b480e8fc..54653728d49cc0a4f7731546786f9107af0302e5 100644 (file)
--- 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 36d4a8211a50dad7ae17368d5d3db02687675d08..def789e33305fd52156ead4b21f09bac72bd00e5 100644 (file)
--- 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 fc727d607adf6b3def12c358cfeaddab7066a81d..3d2b3566865bc785f25442fb3e95390375c45744 100644 (file)
--- 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 59c904657dfd393e3a0ea0ef0c5fcd4677ee7d40..51ba00de4d0f3a02df4b51bd5c0031f2aad6330f 100644 (file)
--- 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 49def615f3a4d23b57150446713938362a4345f2..acec27520de55f31d85d93cea5dc577b1007e1da 100644 (file)
--- 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 c142a65f7f19b26338b5ad08a6b7277aa27b8d35..85a0c94cd9ebfaee93f6b7482b42a3c886f7f06b 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]\{.*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 972c07c13d5e5851806c6c3658f2c721467f9208..f4eccb1f0ef9c985f7fab7ae8f8616a48435dd0b 100644 (file)
--- 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 = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+               } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
+                       $col1="bgcolor='${Header::colourorange}'";
+                       $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";
                }
        }
        # move to blue if really down

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 867bff7ebee9ab38ab3bf9226417e37d129b4cd8..ad8db192bbbbb2cb3e8a212113631a70b5028830 100644 (file)
--- 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 5333c13b52b504bcad8fc52d8c16a955aabb8c16..3deb4b555a1b3fcf00bc4550ebfba8dd9df3d19a 100644 (file)
--- 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',