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 71a355c3a246a5de886ffee0376d83be942f48df (commit) via b15b70bc6b6b5f6d8b62e5b730b68d86f59810e6 (commit) via eb09c90ef47606f616201fddc5e783149aee9228 (commit) via e37e796206b575d87d652c5c68a96296dbbb8543 (commit) from 26796f3a4b9f6900e46812fc91090894b1d75658 (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 71a355c3a246a5de886ffee0376d83be942f48df Merge: 26796f3a4 b15b70bc6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 5 15:25:36 2019 +0000

Merge branch 'ipsec-on-demand' into next

commit b15b70bc6b6b5f6d8b62e5b730b68d86f59810e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 5 15:24:19 2019 +0000

vpnmain.cgi: Make on-demand mode default for IPsec VPNs

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

commit eb09c90ef47606f616201fddc5e783149aee9228 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 5 15:23:33 2019 +0000

vpnmain.cgi: Carry over START_ACTION attribute correctly

This setting was not carried correctly and therefore the default was ignored.

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

-----------------------------------------------------------------------

Summary of changes: config/etc/sysctl.conf | 4 ---- html/cgi-bin/vpnmain.cgi | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 7751bfd8a..9a943fffa 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -80,9 +80,5 @@ net.ipv4.tcp_rmem = 4096 87380 16777216 net.ipv4.tcp_wmem = 4096 16384 16777216 net.ipv4.udp_mem = 3145728 4194304 16777216

-# Approximate time in us to busy loop waiting for packets on the device queue -net.core.busy_read=50 -net.core.busy_poll=50 - # Enable TCP fast-open net.ipv4.tcp_fastopen = 3 diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index c84884239..00282d50b 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1340,6 +1340,7 @@ END $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32]; + $cgiparams{'START_ACTION'} = $confighash{$cgiparams{'KEY'}}[33]; $cgiparams{'INACTIVITY_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[34]; $cgiparams{'MODE'} = $confighash{$cgiparams{'KEY'}}[35]; $cgiparams{'INTERFACE_MODE'} = $confighash{$cgiparams{'KEY'}}[36]; @@ -1921,6 +1922,7 @@ END $confighash{$key}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$key}[31] = $cgiparams{'DPD_DELAY'}; $confighash{$key}[32] = $cgiparams{'FORCE_MOBIKE'}; + $confighash{$key}[33] = $cgiparams{'START_ACTION'}; $confighash{$key}[34] = $cgiparams{'INACTIVITY_TIMEOUT'}; $confighash{$key}[35] = $cgiparams{'MODE'}; $confighash{$key}[36] = $cgiparams{'INTERFACE_MODE'}; @@ -2080,6 +2082,7 @@ VPNCONF_ERROR: <input type='hidden' name='DPD_DELAY' value='$cgiparams{'DPD_DELAY'}' /> <input type='hidden' name='DPD_TIMEOUT' value='$cgiparams{'DPD_TIMEOUT'}' /> <input type='hidden' name='FORCE_MOBIKE' value='$cgiparams{'FORCE_MOBIKE'}' /> + <input type='hidden' name='START_ACTION' value='$cgiparams{'START_ACTION'}' /> <input type='hidden' name='INACTIVITY_TIMEOUT' value='$cgiparams{'INACTIVITY_TIMEOUT'}' /> END ;

hooks/post-receive -- IPFire 2.x development tree