X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=33626b1f333594c9a73d929dda5dc472cb5d0cbc;hb=dadfb1ecc1336541c2fa621d31aa5d5ddd9cf7bc;hp=fa6c2469b4e8801c05844031ac5b7b60fb9efe47;hpb=80fceca51613802a5ee2d18b142dbbe2201cdd2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index fa6c2469b..33626b1f3 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -3,23 +3,21 @@
 #       | Inspire Internet Relay Chat Daemon |
 #       +------------------------------------+
 #
-#  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
-#                       E-mail:
-#                <brain@chatspike.net>
-#                <Craig@chatspike.net>
+#  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
 #
-# Written by Craig Edwards, Craig McLure, and others.
 # This program is free but copyrighted software; see
-#            the file COPYING for details.
+#          the file COPYING for details.
 #
-#               I HATE PERL.. kthxbye
 # ---------------------------------------------------
+#
 use POSIX;
 
 my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
 my $libpath	=	"@LIBRARY_DIR@";
+my $valgrindlogpath	=	"$basepath/valgrindlogs";
 my $executable	=	"@EXECUTABLE@";
 my $version	=	"@VERSION@";
 my @filesparsed;
@@ -33,6 +31,7 @@ if ($arg eq "start") { start(); exit(); }
 if ($arg eq "debug") { debug(); exit(); }
 if ($arg eq "screendebug") { screendebug(); exit() }
 if ($arg eq "valdebug") { valdebug(); exit(); }
+if ($arg eq "valdebug-unattended") { valdebugunattended(); exit(); }
 if ($arg eq "screenvaldebug") { screenvaldebug(); exit(); }
 if ($arg eq "stop") { stop(); exit(); }
 if ($arg eq "status") {
@@ -91,7 +90,7 @@ if ($arg eq "Cheese-Sandwich") {
 ###
 print "Invalid Argument: $arg\n";
 print "Usage: inspircd (start|stop|restart|rehash|status|cron|checkconf|version)\n";
-print "Developer arguments: (debug|screendebug|valdebug|screenvaldebug)\n";
+print "Developer arguments: (debug|screendebug|valdebug|valdebug-unattended|screenvaldebug)\n";
 exit();
 
 ###
@@ -103,6 +102,7 @@ sub start {
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 	# If we are still alive here.. Try starting the IRCd..
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
 	system("$binpath/$executable");
 	return 1;
@@ -113,12 +113,13 @@ sub debug {
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
 	# Check we have gdb
 	checkgdb();
 
 	# If we are still alive here.. Try starting the IRCd..
-	system("gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+	system("gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug");
 }
 
 sub screendebug
@@ -144,6 +145,7 @@ sub valdebug
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
 	# Check we have valgrind and gdb
 	checkvalgrind();
@@ -155,12 +157,47 @@ sub valdebug
 	system("valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10 $binpath/$executable -nofork -debug -nolog");
 }
 
+sub valdebugunattended
+{
+	# NOTE: To make sure valgrind generates coredumps, set soft core limit in /etc/security/limits.conf to unlimited
+	# Check to see its not 'running' already.
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+
+	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
+
+	# Check we have valgrind and gdb
+	checkvalgrind();
+	checkgdb();
+
+	# If we are still alive here.. Try starting the IRCd..
+	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
+	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
+	#
+	# NOTE: Saving the debug log (redirected stdout), while useful, is a potential security risk AND one hell of a spacehog. DO NOT SAVE THIS WHERE EVERYONE HAS ACCESS!
+	# Redirect stdout to /dev/null if you're worried about the security.
+	#
+	my $pid = fork;
+	if ($pid == 0) {
+		POSIX::setsid();
+		use Fcntl;
+		-d $valgrindlogpath or mkdir $valgrindlogpath or die "Cannot create $valgrindlogpath: $!\n";
+		my $suffix = strftime("%Y%m%d-%H%M%S", localtime(time)) . ".$$";
+		open STDIN, '<', '/dev/null' or die "Can't redirect STDIN to /dev/null: $!\n";
+		sysopen STDOUT, "$valgrindlogpath/out.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0600 or die "Can't open $valgrindlogpath/out.$suffix: $!\n";
+		sysopen STDERR, "$valgrindlogpath/valdebug.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0666 or die "Can't open $valgrindlogpath/valdebug.$suffix: $!\n";
+		exec "valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2 $binpath/$executable -nofork -debug -nolog";
+		die "Can't execute valgrind: $!\n";
+	}
+}
+
 sub screenvaldebug
 {
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+	print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
 
 	#Check we have gdb
 	checkvalgrind();
@@ -178,15 +215,17 @@ sub stop {
 	# Get to here, we have something to kill.
 	my $pid = getprocessid();
 	print "Stopping InspIRCd (pid: $pid)...\n";
-	system("kill -TERM $pid >/dev/null 2>&1");
-	# Give it a second to exit
-	sleep(1);
-	if (getstatus() == 1)
-	{
-		print "InspIRCd not dying quietly -- forcing kill\n";
-		system("kill -9 $pid >/dev/null 2>&1");
+	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 30 : 5;
+	kill TERM => $pid;
+	for (1..$maxwait) {
+		sleep 1;
+		if (getstatus() == 1) {
+			print "InspIRCd Stopped.\n";
+			return;
+		}
 	}
-	print "InspIRCd Stopped.\n";
+	print "InspIRCd not dying quietly -- forcing kill\n";
+	kill KILL => $pid;
 }
 
 # GetPidfile Version 2 - Now With Include Support..
@@ -202,74 +241,72 @@ sub stop {
 # -- Brain
 
 sub getpidfile {
-  my ($file) = @_;
-  # Before we start, do we have a PID already? (Should never occur)
-  if ($pid ne "") {
-    return;
-  }
-  # Are We using a relative path?
-  if ($file !~ /^\//) {
-    # Convert it to a full path..
-    $file = $confpath . $file;
-  }
-
-  # Have we checked this file before?
-  for (my $i = 0; $i < $filesparsed; $i++) {
-    if ($filesparsed[$i] eq $file) {
-      # Already Parsed, Possible recursive loop..
-      return;
-    }
-  }
-
-  # If we get here, Mark as 'Read'
-  $filesparsed[$filesparsed] = $file;
-
-  # Open the File..
-  open INFILE, "< $file" or die "Unable to open file $file\n";
-  # Grab entire file contents..
-  my(@lines) = <INFILE>;
-  # Close the file
-  close INFILE;
-
-  # remove trailing spaces
-  chomp(@lines);
-  foreach $i (@lines) {
-    # clean it up
-    $i =~ s/[^=]+=\s(.*)/\1/;
-    # Does this file have a pid?
-    if (($i =~ /<pid file=\"(\S+)\">/i) && ($i !~ /^#/))
-    {
-      # Set the PID file and return.
-      $pidfile = $1;
-      return;
-    }
-  }
-
-  # If we get here, NO PID FILE! -- Check for includes
-  foreach $i (@lines) {
-    $i =~ s/[^=]+=\s(.*)/\1/;
-    if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
-    {
-      # Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
-      getpidfile($1);
-      # Was a PID found?
-      if ($pidfile ne "") {
-	# Yes, Return.
-	return;
-      }
-    }
-  }
-
-  # End of includes / No includes found. Using default.
-  $pidfile = $confpath . "inspircd.pid";
+	my ($file) = @_;
+	# Before we start, do we have a PID already? (Should never occur)
+	if ($pid ne "") {
+		return;
+	}
+	# Are We using a relative path?
+	if ($file !~ /^\//) {
+		# Convert it to a full path.
+		$file = $confpath . $file;
+	}
+
+	# Have we checked this file before?
+	for (my $i = 0; $i < $filesparsed; $i++) {
+		if ($filesparsed[$i] eq $file) {
+			# Already Parsed, Possible recursive loop..
+			return;
+		}
+	}
+
+	# If we get here, Mark as 'Read'
+	$filesparsed[$filesparsed] = $file;
+
+	# Open the File..
+	open INFILE, "< $file" or die "Unable to open file $file\n";
+	# Grab entire file contents..
+	my(@lines) = <INFILE>;
+	# Close the file
+	close INFILE;
+
+	# remove trailing spaces
+	chomp(@lines);
+	foreach $i (@lines) {
+		# clean it up
+		$i =~ s/[^=]+=\s(.*)/\1/;
+		# Does this file have a pid?
+		if (($i =~ /<pid file=\"(\S+)\">/i) && ($i !~ /^#/))
+		{
+			# Set the PID file and return.
+			$pidfile = $1;
+			return;
+		}
+	}
+
+	# If we get here, NO PID FILE! -- Check for includes
+	foreach $i (@lines) {
+		$i =~ s/[^=]+=\s(.*)/\1/;
+		if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
+		{
+			# Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
+			getpidfile($1);
+			# Was a PID found?
+			if ($pidfile ne "") {
+				# Yes, Return.
+				return;
+			}
+		}
+	}
+
+	# End of includes / No includes found. Using default.
+	$pidfile = $confpath . "inspircd.pid";
 }
 
 sub getstatus {
 	my $pid = getprocessid();
-	if ($pid == 0) { return 0; }
-	$status = system("kill -0 $pid >/dev/null 2>&1") / 256;
-	if ($status == 0) { return 1; }
-	else { return 0; }
+	return 0 if $pid == 0;
+	return kill 0, $pid;
 }