X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=76e7248c192a31e72d0d8fe22ed32e1b4123af44;hb=8828741c72ff0774ba461ca21caf5768d05079bc;hp=f03595b42b7e0ab9cfa75756a0fe662a6e7f876a;hpb=1f7f6c58d47246ed176a4af92a231660dfac644a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index f03595b42..76e7248c1 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,6 +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|valdebug-unattended|screenvaldebug)\n";
 exit();
 
 ###
@@ -102,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;
@@ -112,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
@@ -143,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();
@@ -154,12 +157,46 @@ 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();
+		umask 022;
+		open STDERR, '>', "$valgrindlogpath/valdebug.$$" or die $!;
+		umask 066;
+		open STDIN, '/dev/null' or die $!;
+		open STDOUT, '>', "$valgrindlogpath/out.$$" or die $!;
+		exec "valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2 $binpath/$executable -nofork -debug -nolog";
+		exit 1;
+	}
+}
+
 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();
@@ -177,15 +214,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..
@@ -265,10 +304,8 @@ sub getpidfile {
 
 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;
 }
 
 
@@ -361,13 +398,11 @@ sub validateconf
 #       push @newlines, "<!DOCTYPE config SYSTEM \"".$confpath."inspircd.dtd\">";
 	push @newlines, "<config>";
 
-	foreach $i (@lines) {
+	foreach $i (@lines)
+	{
 		# remove trailing newlines
 		chomp($i);
 
-		# clean up
-		$i =~ s/[^=]+=\s(.*)/\1/;
-
 		# convert tabs to spaces
 		$i =~ s/\t/ /g;
 
@@ -380,11 +415,25 @@ sub validateconf
 		# remove trailing #s
 		$i =~ s/(.*)#$/\1/;
 
+		# remove trailing comments
+		my $line = "";
+		my $quote = 0;
+		for (my $j = 0; $j < length($i); $j++)
+		{
+			if (substr($i,$j, 1) eq '"') { $quote = ($quote) ? 0 : 1; } elsif (substr($i,$j, 1) eq "#" && !$quote) { last; }
+			$line .= substr($i,$j, 1);
+		}
+		$i = $line;
+
 		# remove trailing spaces
 		$i =~ s/ *$//;
 
+		# setup incf for include check and clean it up, since this breaks parsing use local var
+		my $incf = $i;
+		$incf =~ s/[^=]+=\s(.*)/\1/;
+
 		# include file?
-		if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
+		if (($incf =~ s/\<include file=\"(.+?)\"\>//i) && ($incf !~ /^#/))
 		{
 			# yes, process it
 			validateconf($1);