-
+
+ ";
}
- my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
- if ( "$HOSTNAME" ne "" ) {
- print <Hostname: | $HOSTNAME |
-END
- }
-
- if ( -e "/var/ipfire/red/remote-ipaddress" ) {
- my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`;
- chomp($GATEWAY);
+ if ( $netsettings{'GREEN_DEV'} ) {
+ my $sub=&General::iporsubtocidr($netsettings{'GREEN_NETMASK'});
print <Gateway: | $GATEWAY |
-END
- }
-
- my $DNS1 = `cat /var/ipfire/red/dns1`;
- my $DNS2 = `cat /var/ipfire/red/dns2`;
- chomp($DNS1);
- chomp($DNS1);
-
- if ( $DNS1 ) { print <DNS-Server: | $DNS1
-END
- }
- if ( $DNS2 ) { print <$DNS2
-END
- } else { print <
-END
- }
-
- if ( $netsettings{'GREEN_DEV'} ) { print <
+
+
+ $Lang::tr{'network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
+
$Lang::tr{'lan'}
- | $netsettings{'GREEN_ADDRESS'}
- |
+ | $netsettings{'GREEN_ADDRESS'}/$sub
+ |
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'}
- |
+ | $netsettings{'BLUE_ADDRESS'}/$sub
+ |
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'}; }
}
- if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}
- | $netsettings{'ORANGE_ADDRESS'}
- | Online
+ if ( $netsettings{'ORANGE_DEV'} ) {
+ my $sub=&General::iporsubtocidr($netsettings{'ORANGE_NETMASK'});
+ print <$Lang::tr{'dmz'}
+ | $netsettings{'ORANGE_ADDRESS'}/$sub
+ | Online
END
}
- if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
- `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
+#check if IPSEC is running
+if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
+ `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
+ $haveipsec=1;
+ my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
+print<$Lang::tr{'ipsec'}
+ | $ipsecip
+ | Online
+END
+}
+
+#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";
+ $haveovpn=1;
+print <
+
+ OpenVPN
+ |
+ $ovpnip
+ | Online
+END
+ }
+print" | | | | | | ";
+&Header::closebox();
+
+# Start of Box wich contains all vpn connections
+ &Header::openbox('100%', 'center', $Lang::tr{'vpn'}) if ($haveipsec || $haveovpn);
+
+#show ipsec connectiontable
+ if ( $haveipsec ) {
my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
my @status = `/usr/local/bin/ipsecctrl I`;
my %confighash = ();
&General::readhasharray("${General::swroot}/vpn/config", \%confighash);
print <$Lang::tr{'vpn'}
- | $ipsecip
- | Online
+
+
+
+ $Lang::tr{'ipsec network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
+
END
my $id = 0;
my $gif;
+ my $col="";
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'; }
-
+ my ($vpnip,$vpnsub) = split("/",$confighash{$key}[11]);
+ $vpnsub=&General::iporsubtocidr($vpnsub);
+ $vpnip="$vpnip/$vpnsub";
if ($id % 2) {
- print "$confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
+ $col="bgcolor='$color{'color20'}'";
+ print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $vpnip | ";
} else {
- print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $confighash{$key}[11] | ";
+ $col="bgcolor='$color{'color22'}'";
+ print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") | $vpnip | ";
}
- my $active = "";
+ my $active = "$Lang::tr{'capsclosed'} | ";
if ($confighash{$key}[0] eq 'off') {
- $active = "";
+ $active = "$Lang::tr{'capsclosed'} | ";
} else {
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
@@ -380,46 +361,38 @@ END
}
}
}
- print "$active | ";
+ print "$active";
}
+ print " ";
}
###
# Check if there is any OpenVPN connection configured.
###
-if ( -s "${General::swroot}/ovpn/ovpnconfig")
- {
+if ( $haveovpn )
+{
print <
+
-
- OpenVPN
- |
+ $Lang::tr{'openvpn network'} |
+ $Lang::tr{'ip address'} |
+ $Lang::tr{'status'} |
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 <$ovpnip
- Online
-END
-
- }
-
# Print the OpenVPN N2N connection status.
if ( -d "${General::swroot}/ovpn/n2nconf") {
my %confighash=();
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+ my $lines;
+ my $col="";
foreach my $dkey (keys %confighash) {
+ $lines++;
if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) {
my $tport = $confighash{$dkey}[22];
next if ($tport eq '');
@@ -437,16 +410,24 @@ END
} else {
$display = $tustate[1];
}
-
+ if ($lines %2){
+ $col="bgcolor='$color{'color20'}'";
+ }else{
+ $col="bgcolor='$color{'color22'}'";
+ }
+ #make cidr from ip
+ my ($vpnip,$vpnsub) = split("/",$confighash{$dkey}[11]);
+ my $vpnsub=&General::iporsubtocidr($vpnsub);
+ my $vpnip="$vpnip/$vpnsub";
print <
-
+ |
$confighash{$dkey}[1]
|
-
- $confighash{$dkey}[11]
+ |
+ $vpnip
|
-
+ |
$display
@@ -459,7 +440,7 @@ END
}
}
}
-
+&Header::closebox();
# Fireinfo
if ( ! -e "/var/ipfire/main/send_profile") {
$warnmessage .= "$Lang::tr{'fireinfo please enable'}";
@@ -534,28 +515,6 @@ END
if ( -e "/var/run/need_reboot" ) {
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();
}
| | | | | | |