Merge branch 'ipsec-on-demand' into next

diff --cc html/cgi-bin/vpnmain.cgi
index c84884239acee44fb1e62d3a8860a15aae5dbb52,fc15be382e550fb4020935556021e46ede1b55c5..00282d50b2d9c8eefa93157345c05e22ca86d9b3
--- 1/html/cgi-bin/vpnmain.cgi
--- 2/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@@ -1340,11 -1315,8 +1340,12 @@@ EN
                $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];
 +              $cgiparams{'INTERFACE_ADDRESS'}         = $confighash{$cgiparams{'KEY'}}[37];
 +              $cgiparams{'INTERFACE_MTU'}             = $confighash{$cgiparams{'KEY'}}[38];
  
                if (!$cgiparams{'DPD_DELAY'}) {
                        $cgiparams{'DPD_DELAY'} = 30;
@@@ -1921,13 -1856,11 +1922,14 @@@ EN
        $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'};
 +      $confighash{$key}[37] = $cgiparams{'INTERFACE_ADDRESS'};
 +      $confighash{$key}[38] = $cgiparams{'INTERFACE_MTU'};
  
        # free unused fields!
 -      $confighash{$key}[6] = 'off';
        $confighash{$key}[15] = 'off';
  
        &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
@@@ -2080,7 -1987,7 +2082,8 @@@ 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
  ;
        if ($cgiparams{'KEY'}) {