[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8057ab15b9efeecf8eca7ad4ebba170f141bd3de - IPFire-SCM

15 Feb 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  8057ab15b9efeecf8eca7ad4ebba170f141bd3de (commit)
       via  1ee1666ee45268db405a66b8ec05501c718e7702 (commit)
      from  dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8057ab15b9efeecf8eca7ad4ebba170f141bd3de
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 15 12:15:42 2017 +0000
Show better connection information for on-demand IPsec connections
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1ee1666ee45268db405a66b8ec05501c718e7702
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 15 11:22:27 2017 +0000
IPsec: Close on-demand tunnels after 15 min of inactivity
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 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 | 9 +++++++++
 langs/de/cgi-bin/de.pl   | 1 +
 langs/en/cgi-bin/en.pl   | 1 +
 12 files changed, 25 insertions(+)
Difference in files:

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 36d4a82..def789e 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 b21c338..25ee841 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 e723028..83268a3 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 22a8934..5465372 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 36d4a82..def789e 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 fc727d6..3d2b356 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 59c9046..51ba00d 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 49def61..acec275 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 c142a65..85a0c94 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 b6469c0..f4eccb1 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -413,6 +413,12 @@ sub writeipsecfiles {
    		print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n";
    	} else {
    		print CONF "\tauto=$start_action\n";
+
+			# If in on-demand mode, we terminate the tunnel
+			# after 15 min of no traffic
+			if ($start_action eq 'route') {
+				print CONF "\tinactivity=900\n";
+			}
    	}
# Fragmentation
@@ -2799,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 867bff7..ad8db19 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 5333c13..3deb4b5 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',
hooks/post-receive
--
IPFire 2.x development tree

    