Merge commit 'ms/openvpn-n2n' into next

diff --combined html/cgi-bin/index.cgi
index b325250a58e9b0d37fe316692028e71856e4050f,d372d5255a1cbba29b1613f69242907ebb29f186..0ef95ba8ca26c83d6f203736793b3ee7c3b17af5
--- 1/html/cgi-bin/index.cgi
--- 2/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@@ -369,9 -369,7 +369,9 @@@ EN
                            $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
                        } else {
                            foreach my $line (@status) {
 -                              if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
 +                              if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
 +                                  ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
 +                                  {
                                    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
                                }
                           }
@@@ -390,6 -388,25 +390,25 @@@
  END
        }
  
+ ###
+ # m.a.d n2n
+ ###
+ 
+ if ( -d "${General::swroot}/ovpn/n2nconf") {
+ my %confighash=();
+ &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+ foreach my $dkey (keys %confighash) {
+ if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') {
+ my @n2novpnet =  split(/\//,$confighash{$dkey}[27]);
+     print <<END;
+               <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
+       <td width='30%' align='center'> $n2novpnet[0]
+               <td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font>
+ END
+ }
+ }
+   }
+ 
  # Fireinfo
  if ( ! -e "/var/ipfire/main/send_profile") {
        $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";