-
+
+ ";
}
- my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
- if ( "$HOSTNAME" ne "" ) {
+ if ( $netsettings{'GREEN_DEV'} ) {
+ my $sub=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
print <Hostname: | $HOSTNAME |
+
+
+
+ $Lang::tr{'network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
+
+ $Lang::tr{'lan'}
+ | $netsettings{'GREEN_ADDRESS'}/$sub
+ |
END
+ if ( $proxysettings{'ENABLE'} eq 'on' ) {
+ print $Lang::tr{'advproxy on'};
+ if ( $proxysettings{'TRANSPARENT'} eq 'on' ) { print " (transparent)"; }
+ } else { print $Lang::tr{'advproxy off'}; }
}
-
- if ( -e "/var/ipfire/red/remote-ipaddress" ) {
- my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`;
- chomp($GATEWAY);
+ if ( $netsettings{'BLUE_DEV'} ) {
+ my $sub=&General::iporsubtocidr($netsettings{'BLUE_NETMASK'});
print <Gateway: | $GATEWAY |
+ | $Lang::tr{'wireless'}
+ | $netsettings{'BLUE_ADDRESS'}/$sub
+ |
END
+ if ( $proxysettings{'ENABLE_BLUE'} eq 'on' ) {
+ print $Lang::tr{'advproxy on'};
+ if ( $proxysettings{'TRANSPARENT_BLUE'} eq 'on' ) { print " (transparent)"; }
+ } else { print $Lang::tr{'advproxy off'}; }
}
-
- my $DNS1 = `cat /var/ipfire/red/dns1`;
- my $DNS2 = `cat /var/ipfire/red/dns2`;
- chomp($DNS1);
- chomp($DNS1);
-
- if ( $DNS1 ) { print <DNS-Server: | $DNS1
+ if ( $netsettings{'ORANGE_DEV'} ) {
+ my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
+ print <$Lang::tr{'dmz'}
+ | $netsettings{'ORANGE_ADDRESS'}/$sub
+ | Online
END
}
- if ( $DNS2 ) { print <$DNS2
-END
- } else { print <
+#check if IPSEC is running
+if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
+ my $ipsecip = $vpnsettings{'VPN_IP'};
+print<$Lang::tr{'ipsec'}
+ | $ipsecip
+ | Online
END
- }
+}
- if ( $netsettings{'GREEN_DEV'} ) { print <$Lang::tr{'lan'}
- | $netsettings{'GREEN_ADDRESS'}
- |
+#check if OpenVPN is running
+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,$sub) = split("/",$confighash{'DOVPN_SUBNET'});
+ $sub=&General::iporsubtocidr($sub);
+ $ovpnip="$ovpnip/$sub";
+print <
+
+ OpenVPN
+ |
+ $ovpnip
+ | Online
END
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) {
- print $Lang::tr{'advproxy on'};
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; }
- } else { print $Lang::tr{'advproxy off'}; }
}
- if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}
- | $netsettings{'BLUE_ADDRESS'}
- |
-END
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) {
- print $Lang::tr{'advproxy on'};
- if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
- } else { print $Lang::tr{'advproxy off'}; }
+print" | | | | | | | | ";
+&Header::closebox();
+
+#Check if there are any vpns configured (ipsec and openvpn)
+&General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
+foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
+ if ($vpnconfig{$key}[0] eq 'on'){
+ $showipsec=1;
+ $showbox=1;
+ last;
}
- if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}
- | $netsettings{'ORANGE_ADDRESS'}
- | Online
-END
+}
+&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig);
+foreach my $dkey (sort { ncmp($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+ if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+ $showbox=1;
+ $showovpn=1;
+ last;
}
- if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
- `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
- my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
+}
+
+if ($showbox){
+# Start of Box wich contains all vpn connections
+ &Header::openbox('100%', 'center', $Lang::tr{'vpn'});
+#show ipsec connectiontable
+ if ( $showipsec ) {
+ my $ipsecip = $vpnsettings{'VPN_IP'};
my @status = `/usr/local/bin/ipsecctrl I`;
my %confighash = ();
- &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
- print <$Lang::tr{'vpn'}
- | $ipsecip
- | Online
-END
my $id = 0;
my $gif;
- foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
- if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
-
- if ($id % 2) {
- print " | $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
- } else {
- print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
- }
-
- my $active = "";
- if ($confighash{$key}[0] eq 'off') {
- $active = "";
- } else {
- foreach my $line (@status) {
- if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
- ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
- {
- $active = "";
+ my $col="";
+ my $count=0;
+ print <
+
+
+ $Lang::tr{'ipsec network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
+
+END
+ foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
+ if ($vpnconfig{$key}[0] eq 'on') {
+ $count++;
+ my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
+ $vpnsub=&General::iporsubtocidr($vpnsub);
+ $vpnip="$vpnip/$vpnsub";
+ if ($count % 2){
+ $col="bgcolor='$color{'color22'}'";
+ }else{
+ $col="bgcolor='$color{'color20'}'";
+ }
+ if ($id % 2) {
+ print "$vpnconfig{$key}[1] | $vpnip | ";
+ } else {
+ print " $vpnconfig{$key}[1] | $vpnip | ";
+ }
+ my $active = "$Lang::tr{'capsclosed'} | ";
+ if ($vpnconfig{$key}[0] eq 'off') {
+ $active = "$Lang::tr{'capsclosed'} | ";
+ } else {
+ foreach my $line (@status) {
+ if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
+ $active = "$Lang::tr{'capsopen'} | ";
+ }
+ }
}
- }
+ print "$active";
}
- print "$active | ";
}
+ print " ";
}
###
# Check if there is any OpenVPN connection configured.
###
-if ( -s "${General::swroot}/ovpn/ovpnconfig")
- {
- print <
-
- OpenVPN
- |
-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'};
+ if ( $showovpn ){
print <$ovpnip
- Online
+
+
+
+ $Lang::tr{'openvpn network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
END
- }
-
- # 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
-
-
- |
-
+ # Check if the OpenVPN server for Road Warrior Connections is running and display status information.
+ my $active;
+ my $count=0;
+ # Print the OpenVPN N2N connection status.
+ if ( -d "${General::swroot}/ovpn/n2nconf") {
+ my $col="";
+ foreach my $dkey (sort { ncmp ($ovpnconfig{$a}[1],$ovpnconfig{$b}[1])} keys %ovpnconfig) {
+ if (($ovpnconfig{$dkey}[3] eq 'net') && (-e "/var/run/$ovpnconfig{$dkey}[1]n2n.pid")){
+ $count++;
+ my $tport = $ovpnconfig{$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' || ($tustate[1] eq 'WAIT')) {
+ $display_colour = $Header::colourgreen;
+ $display = $Lang::tr{'capsopen'};
+ } else {
+ $display = $tustate[1];
+ }
+ if ($count %2){
+ $col="bgcolor='$color{'color22'}'";
+ }else{
+ $col="bgcolor='$color{'color20'}'";
+ }
+ $active='off';
+ #make cidr from ip
+ my ($vpnip,$vpnsub) = split("/",$ovpnconfig{$dkey}[11]);
+ my $vpnsub=&General::iporsubtocidr($vpnsub);
+ my $vpnip="$vpnip/$vpnsub";
+ print <
+ $ovpnconfig{$dkey}[1] |
+ $vpnip |
+ $display |
+
END
+ }
}
}
+ if ($active ne 'off'){
+ print "$Lang::tr{'ovpn no connections'} | ";
+ }
+ print" ";
}
+&Header::closebox();
}
# Fireinfo
@@ -520,74 +528,21 @@ foreach my $disk (@files) {
$warnmessage .= "$disk - $Lang::tr{'deprecated fs warn'}\n\n";
}
-
if ($warnmessage) {
+ &Header::openbox('100%','center', );
+ print "";
+ print "$Lang::tr{'fwhost hint'} | ";
print "$warnmessage | ";
+ &Header::closebox();
}
-print <
-END
-;
+
+print "";
&Pakfire::dblist("upgrade", "notice");
-print < $Lang::tr{'needreboot'}!";
}
-} else {
- my $message='';
- if ($death) {
- $message = $Lang::tr{'ipfire has now shutdown'};
- } else {
- $message = $Lang::tr{'ipfire has now rebooted'};
- }
- print <
-
-
-
- |
-
-
-$message
-
-END
-;
-}
-
-&Header::closebox();
-}
-
-else {
-&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
-print <
-END
-;
-if ( -e "/usr/share/doc/licenses/GPLv3" ) {
- print '';
-}
-else {
- print ' GNU GENERAL PUBLIC LICENSE ';
-}
-print <
-
-
- $Lang::tr{'gpl unofficial translation of the general public license v3'}
-
-END
-
-&Header::closebox();
-}
+print "";
&Header::closebigbox();
&Header::closepage();
| | | |