X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=002352354a15a05ad780ba64ced3f66547328964;hp=d372d5255a1cbba29b1613f69242907ebb29f186;hb=54fd05358b874a2bbb5c0f58f4a04f010c196388;hpb=d96c89eb0619c4f4b10ec7724e55f10f84defd2a

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index d372d5255a..002352354a 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -20,6 +20,7 @@
 ###############################################################################
 
 use strict;
+use Net::Telnet;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -369,7 +370,9 @@ END
 			    $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>";
 				}
 			   }
@@ -385,7 +388,9 @@ END
 		<tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
 	  	<td width='30%' align='center'>$ovpnip
   		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+	
 END
+
 	}
 
 ###
@@ -394,18 +399,42 @@ END
 
 if ( -d "${General::swroot}/ovpn/n2nconf") {
 my %confighash=();
+my $display = '';
+
 &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>
+if ($confighash{$dkey}[3] eq 'net') {
+
+
+          if (-e "/var/run/$confighash{$dkey}[1]n2n.pid") {
+          my @output = "";
+          my @tustate = "";
+          my $tport = $confighash{$dkey}[22];
+          my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
+          if ($tport ne '') {
+          $tnet->open('127.0.0.1');
+          @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+          @tustate = split(/\,/, $output[1]);
+         if ( $tustate[1] eq 'CONNECTED')
+          { $display = "<font color=$Header::colourgreen>$Lang::tr{'capsopen'}</font>";
+          } else {
+          $display = "<font color=$Header::colourred>$tustate[1]</font>"; }
+ 
+	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'> $confighash{$dkey}[10]<td width='45%' align='center'> $display 
+
 END
+;
+}
 }
 }
-  }
+}
+}
+
+###
+# m.a.d n2n end
+###
 
 # Fireinfo
 if ( ! -e "/var/ipfire/main/send_profile") {