X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=e37540bc284ff833a30b7d4afd736df9df864ab8;hb=7b82bee7c4886652ef64f639fd877daa727d1348;hp=01bb3d6850c13f25f5de12f6f8c94b348ed69353;hpb=08b4415ef2efe8a22a39f5e836099269fa024738;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 01bb3d685..e37540bc2 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -241,19 +241,22 @@ END print < - + + + + + + "; } } - if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` || - `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` || - `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) { - my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`; + +### +# Check if there is any OpenVPN connection configured. +### + +if ( -s "${General::swroot}/ovpn/ovpnconfig") + { + print < + +END + # Check if the OpenVPN server for Road Warrior Connections is running and display status information. + my %confighash=(); + + &General::readhash("${General::swroot}/ovpn/settings", \%confighash); + + if (($confighash{'ENABLED'} eq "on") || + ($confighash{'ENABLED_BLUE'} eq "on") || + ($confighash{'ENABLED_ORANGE'} eq "on")) { + + my $ovpnip = $confighash{'DOVPN_SUBNET'}; print < + + + END -; -} -} -} -} + } + } + } } -### -# m.a.d n2n end -### - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
  • ";
    $Lang::tr{'network'} - IP - $Lang::tr{'status'} -
    $Lang::tr{'internet'}
    -
    $ipaddr - $connstate +
    $Lang::tr{'network'}IP$Lang::tr{'status'}
    $Lang::tr{'internet'}
    $ipaddr $connstate END if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){ print `/usr/local/bin/dialctrl.pl show`; print < +
    +
    $Lang::tr{'profile'}:
    $Lang::tr{'dmz'}
    +
    $Lang::tr{'dmz'}
    $netsettings{'ORANGE_ADDRESS'} Online END @@ -380,62 +383,83 @@ END print "$active + OpenVPN
    +
    OpenVPN
    $ovpnip - Online - + Online 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 = "$Lang::tr{'capsopen'}"; - } else { - $display = "$tustate[1]"; } + # Print the OpenVPN N2N connection status. + if ( -d "${General::swroot}/ovpn/n2nconf") { + my %confighash=(); + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + foreach my $dkey (keys %confighash) { + if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { + my $tport = $confighash{$dkey}[22]; + next if ($tport eq ''); + + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + $tnet->open('127.0.0.1'); + my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + my @tustate = split(/\,/, $output[1]); + + my $display; + my $display_colour = $Header::colourred; + if ( $tustate[1] eq 'CONNECTED') { + $display_colour = $Header::colourgreen; + $display = $Lang::tr{'capsopen'}; + } else { + $display = $tustate[1]; + } - print <OpenVPN n2n
    -
    $confighash{$dkey}[10] $display - + print < + + $confighash{$dkey}[1] + + $confighash{$dkey}[11] + + + + $display + + +