X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=ea19e26f5904cfae7feb21b11ae948091e643bc7;hb=a606377ea89d5aa4d8e01022778dae5ad929d800;hp=0ef95ba8ca26c83d6f203736793b3ee7c3b17af5;hpb=7c0fce586f18ab3df70de1138f85b5bfc72e1a6e;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0ef95ba8c..ea19e26f5 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -20,6 +20,7 @@ ############################################################################### use strict; +use Net::Telnet; # enable only the following on debugging purpose #use warnings; @@ -240,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 + } + } + } } -} - } # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { @@ -462,6 +513,14 @@ foreach my $file (@files) { } } +# Reiser4 warning +my @files = `mount | grep " reiser4 (" 2>/dev/null`; +foreach my $disk (@files) { + chomp ($disk); + $warnmessage .= "
  • $disk - $Lang::tr{'deprecated fs warn'}
    • \n\n"; +} + + if ($warnmessage) { print "
    $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'}:
    		$active + OpenVPN
    +     		OpenVPN
    		$ovpnip - Online + Online 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 <OpenVPN n2n
    -     		$n2novpnet[0] - $confighash{$dkey}[6] + # 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 < + + $confighash{$dkey}[1] + + $confighash{$dkey}[11] + + + + $display + + +
    $warnmessage
    "; }