webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Import VPN changes by the Special Interest Group.

Browse Source 
See here for more details:
  http://lists.ipfire.org/pipermail/sig-vpn/2012-March/000031.html
This commit is contained in:
Michael Tremer
2012-03-06 22:53:07 +01:00
parent 650a4d8097
commit 54fd05358b
8 changed files with 382 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
html/cgi-bin/index.cgi
View File

@@ -20,6 +20,7 @@
###############################################################################
use strict;
use Net::Telnet;
# enable only the following on debugging purpose
#use warnings;
@@ -387,9 +388,54 @@ 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
}
###
# m.a.d n2n
###
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}[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") {
$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";