X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fservices.cgi;h=64fdbba05a4ee6afcaceae2caa1dbee12f485782;hb=87ea30ff5669c0174af3a481f31aba9f868101c6;hp=c24b4601c8fcd85256f9d30191bbae8a9008fcce;hpb=4e481c3a517c27fae6b8e7056fb8a5fdd05c9188;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index c24b4601c8..64fdbba05a 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  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        #
@@ -22,8 +22,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -49,16 +49,34 @@ my %servicenames =(
 	$Lang::tr{'dhcp server'} => 'dhcpd',
 	$Lang::tr{'web server'} => 'httpd',
 	$Lang::tr{'cron server'} => 'fcron',
-	$Lang::tr{'dns proxy server'} => 'dnsmasq',
+	$Lang::tr{'dns proxy server'} => 'unbound',
 	$Lang::tr{'logging server'} => 'syslogd',
 	$Lang::tr{'kernel logging server'} => 'klogd',
 	$Lang::tr{'ntp server'} => 'ntpd',
 	$Lang::tr{'secure shell server'} => 'sshd',
-	$Lang::tr{'vpn'} => 'pluto',
+	$Lang::tr{'vpn'} => 'charon',
 	$Lang::tr{'web proxy'} => 'squid',
 	'OpenVPN' => 'openvpn'
 );
 
+my %link =(
+	$Lang::tr{'dhcp server'} => "<a href=\'dhcp.cgi\'>$Lang::tr{'dhcp server'}</a>",
+	$Lang::tr{'web server'} => $Lang::tr{'web server'},
+	$Lang::tr{'cron server'} => $Lang::tr{'cron server'},
+	$Lang::tr{'dns proxy server'} => $Lang::tr{'dns proxy server'},
+	$Lang::tr{'logging server'} => $Lang::tr{'logging server'},
+	$Lang::tr{'kernel logging server'} => $Lang::tr{'kernel logging server'},
+	$Lang::tr{'ntp server'} => "<a href=\'time.cgi\'>$Lang::tr{'ntp server'}</a>",
+	$Lang::tr{'secure shell server'} => "<a href=\'remote.cgi\'>$Lang::tr{'secure shell server'}</a>",
+	$Lang::tr{'vpn'} => "<a href=\'vpnmain.cgi\'>$Lang::tr{'vpn'}</a>",
+	$Lang::tr{'web proxy'} => "<a href=\'proxy.cgi\'>$Lang::tr{'web proxy'}</a>",
+	'OpenVPN' => "<a href=\'ovpnmain.cgi\'>OpenVPN</a>",
+	"$Lang::tr{'intrusion detection system'} (GREEN)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (GREEN)</a>",
+	"$Lang::tr{'intrusion detection system'} (RED)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (RED)</a>",
+	"$Lang::tr{'intrusion detection system'} (ORANGE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (ORANGE)</a>",
+	"$Lang::tr{'intrusion detection system'} (BLUE)" => "<a href=\'ids.cgi\'>$Lang::tr{'intrusion detection system'} (BLUE)</a>"
+);
+
 my $lines=0; # Used to count the outputlines to make different bgcolor
 
 my $iface = '';
@@ -98,21 +116,33 @@ if ( $querry[0] =~ "processescpu"){
 	&Header::openbox('100%', 'left', $Lang::tr{'services'});
 	print <<END
 <div align='center'>
-<table width='80%' cellspacing='1' border='0'>
-<tr bgcolor='$color{'color20'}'><td align='left'><b>$Lang::tr{'services'}</b></td><td align='center' ><b>$Lang::tr{'status'}</b></td><td align='center'><b>PID</b></td><td align='center'><b>$Lang::tr{'memory'}</b></td></tr>
+<table width='80%' cellspacing='1' class='tbl'>
+<tr>
+	<th align='left'><b>$Lang::tr{'services'}</b></th>
+	<th align='center' ><b>$Lang::tr{'status'}</b></th>
+	<th align='center'><b>PID</b></th>
+	<th align='center'><b>$Lang::tr{'memory'}</b></th>
+</tr>
 END
 ;
 	my $key = '';
+	my $col="";
 	foreach $key (sort keys %servicenames){
 		$lines++;
 		if ($lines % 2){
-			print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>$key</td>\n";
+			$col="bgcolor='$color{'color22'}'";
+			print "<tr><td align='left' $col>";
+			print $link{$key};
+			print "</td>";
 		}else{
-			print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>$key</td>\n";
+			$col="bgcolor='$color{'color20'}'";
+			print "<tr><td align='left' $col>";
+			print $link{$key};
+			print "</td>";
 		}
 
 		my $shortname = $servicenames{$key};
-		my $status = &isrunning($shortname);
+		my $status = &isrunning($shortname,$col);
 
 	 	print "$status\n";
 		print "</tr>\n";
@@ -130,14 +160,14 @@ END
 
 	print <<END
 <div align='center'>
-<table width='80%' cellspacing='1' border='0'>
-<tr bgcolor='$color{'color20'}'>
-<td align='center'><b>Addon</b></td>
-<td align='center'><b>Boot</b></td>
-<td align='center' colspan=2><b>$Lang::tr{'action'}</b></td>
-<td align='center'><b>$Lang::tr{'status'}</b></td>
-<td align='center'><b>PID</b></td>
-<td align='center'><b>$Lang::tr{'memory'}</b></td>
+<table width='80%' cellspacing='1' class='tbl'>
+<tr>
+	<th align='center'><b>Addon</b></th>
+	<th align='center'><b>Boot</b></th>
+	<th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
+	<th align='center'><b>$Lang::tr{'status'}</b></th>
+	<th align='center'><b>PID</b></th>
+	<th align='center'><b>$Lang::tr{'memory'}</b></th>
 </tr>
 END
 ;
@@ -155,21 +185,27 @@ END
 			# blacklist some packages
 			#
 			# alsa has trouble with the volume saving and was not really stopped
+			# mdadm should not stopped with webif because this could crash the system
 			#
 			chomp($_);
-			if ($_ ne "alsa"){
+			if ( $_ eq 'squid' ) {
+				next;
+			}
+			if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
 				$lines++;
 				if ($lines % 2){
-					print "<tr bgcolor='$color{'color22'}'>";
+					print "<tr>";
+					$col="bgcolor='$color{'color22'}'";
 				}else{
-					print "<tr bgcolor='$color{'color20'}'>";
+					print "<tr>";
+					$col="bgcolor='$color{'color20'}'";
 				}
-				print "<td align='left'>$_</td> ";
-				my $status = isautorun($_);
+				print "<td align='left' $col width='31%'>$_</td> ";
+				my $status = isautorun($_,$col);
 				print "$status ";
-				print "<td align='center'><A HREF=services.cgi?$_!start><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></A></td>";
-				print "<td align='center'><A HREF=services.cgi?$_!stop><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></A></td> ";
-				my $status = &isrunningaddon($_);
+				print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
+				print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> ";
+				my $status = &isrunningaddon($_,$col);
 		 		$status =~ s/\\[[0-1]\;[0-9]+m//g;
 
 				chomp($status);
@@ -196,16 +232,17 @@ END
 
 sub isautorun{
 	my $cmd = $_[0];
-	my $status = "<td align='center'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' $col></td>";
 	my $init = `find /etc/rc.d/rc3.d/S??${cmd} 2>/dev/null`;
 	chomp ($init);
 	if ($init ne ''){
-		$status = "<td align='center'><A HREF=services.cgi?$_!disable><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></A></td>";
+		$status = "<td align='center' $col><a href='services.cgi?$_!disable'><img alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' border='0' width='16' height='16' /></a></td>";
 	}
 	$init = `find /etc/rc.d/rc3.d/off/S??${cmd} 2>/dev/null`;
 	chomp ($init);
 	if ($init ne ''){
-		$status = "<td align='center'><A HREF=services.cgi?$_!enable><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></A></td>";
+		$status = "<td align='center' $col><a href='services.cgi?$_!enable'><img alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' border='0' width='16' height='16' /></a></td>";
 	}
 
 	return $status;
@@ -213,11 +250,12 @@ sub isautorun{
 
 sub isrunning{
 	my $cmd = $_[0];
-	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
-	my @memory;
+	my $memory;
 
 	$cmd =~ /(^[a-z]+)/;
 	$exename = $1;
@@ -233,13 +271,18 @@ sub isrunning{
 			}
 			close FILE;
 		}
-		if (open(FILE, "/proc/${pid}/statm")){
-				my $temp = <FILE>;
-				@memory = split(/ /,$temp);
+		if (open(FILE, "/proc/${pid}/status")) {
+			while (<FILE>) {
+				my ($key, $val) = split(":", $_, 2);
+				if ($key eq 'VmRSS') {
+					$memory = $val;
+					last;
+				}
+			}
+			close(FILE);
 		}
-		close FILE;
 		if ($testcmd =~ /$exename/){
-			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center'>$pid</td><td align='center'>$memory[0] KB</td>";
+			$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td><td align='center' $col>$pid</td><td align='center' $col>$memory</td>";
 		}
 	}
 	return $status;
@@ -247,16 +290,18 @@ sub isrunning{
 
 sub isrunningaddon{
 	my $cmd = $_[0];
-	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+	my $col = $_[1];
+	my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	my $pid = '';
 	my $testcmd = '';
 	my $exename;
 	my @memory;
 
-	my $testcmd = `/usr/local/bin/addonctrl $_ status`;
+	my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
 
 	if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
 		$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+		$testcmd =~ s/.* //gi;
 		$testcmd =~ s/[a-z_]//gi;
 		$testcmd =~ s/\[[0-1]\;[0-9]+//gi;
 		$testcmd =~ s/[\(\)\.]//gi;
@@ -264,7 +309,7 @@ sub isrunningaddon{
 		$testcmd =~ s///gi;
 
 		my @pid = split(/\s/,$testcmd);
-		$status .="<td align='center'>$pid[0]</td>";
+		$status .="<td align='center' $col>$pid[0]</td>";
 
 		my $memory = 0;
 
@@ -276,9 +321,9 @@ sub isrunningaddon{
 			}
 			$memory+=$memory[0];
 		}
-		$status .="<td align='center'>$memory KB</td>";
+		$status .="<td align='center' $col>$memory KB</td>";
 	}else{
-		$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2'></td>";
+		$status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td><td colspan='2' $col></td>";
 	}
 	return $status;
 }