X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=05cbe0ea03df3a052219589cefd92d3255cbb40c;hb=9facfd70b5a8ca4dca16fc93f6fcfe1c2bf6ce0f;hp=791017caf706beaf394b77ce0957630f811fa084;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index 791017caf..05cbe0ea0 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -4,26 +4,29 @@
 #       +------------------------------------+
 #
 #  InspIRCd: (C) 2002-2009 InspIRCd Development Team
-# See: http://www.inspircd.org/wiki/index.php/Credits
+# See: http://wiki.inspircd.org/Credits
 #
 # This program is free but copyrighted software; see
 #          the file COPYING for details.
 #
 # ---------------------------------------------------
 #
+use strict;
 use POSIX;
+use Fcntl;
 
 my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
-my $libpath	=	"@LIBRARY_DIR@";
+my $runpath	=	"@BASE_DIR@";
 my $valgrindlogpath	=	"$basepath/valgrindlogs";
 my $executable	=	"@EXECUTABLE@";
 my $version	=	"@VERSION@";
 
+our($pid,$pidfile);
 # Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
 my $arg = shift(@ARGV);
-my $conf = $confpath . "inspircd.conf";
+my $conf;
 for my $a (@ARGV)
 {
 	if ($a =~ m/^--config=(.*)$/)
@@ -32,6 +35,11 @@ for my $a (@ARGV)
 		last;
 	}
 }
+if (!defined $conf) {
+	$conf = $confpath . "inspircd.conf";
+	push @ARGV, '--config='.$conf;
+}
+
 getpidfile($conf);
 
 # System for naming script command subs:
@@ -57,7 +65,7 @@ else
 
 sub cmd_help()
 {
-	@subs = grep { $_ =~ m/^(cmd|dev)_/ && defined(main->can($_)) } keys(%::);
+	my @subs = grep { $_ =~ m/^(cmd|dev)_/ && defined(main->can($_)) } keys(%::);
 	my @cmds = grep /^cmd_/, @subs;
 	my @devs = grep /^dev_/, @subs;
 	local $_;
@@ -124,10 +132,11 @@ sub cmd_start(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 	# If we are still alive here.. Try starting the IRCd..
+	chdir $runpath;
 	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");
 
-	exec { "$binpath/$executable" } "$binpath/$executable", @_;
+	exec "$binpath/$executable", @_;
 	die "Failed to start IRCd: $!\n";
 }
 
@@ -136,6 +145,7 @@ sub dev_debug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	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");
 
@@ -143,7 +153,7 @@ sub dev_debug(@)
 	checkgdb();
 
 	# If we are still alive here.. Try starting the IRCd..
-	exec {gdb} 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(-nofork -debug), @_;
+	exec 'gdb', "--command=$basepath/.gdbargs", '--args', "$binpath/$executable", qw(-nofork -debug), @_;
 	die "Failed to start GDB: $!\n";
 }
 
@@ -152,6 +162,7 @@ sub dev_screendebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
 
 	#Check we have gdb
@@ -161,7 +172,7 @@ sub dev_screendebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec {screen} qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+	exec qw(screen -m -d gdb), "--comand=$basepath/.gdbargs", '-args', "$binpath/$executable", qw(-nofork -debug -nolog), @_;
 	die "Failed to start screen: $!\n";
 }
 
@@ -170,6 +181,7 @@ sub dev_valdebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	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");
 
@@ -180,7 +192,7 @@ sub dev_valdebug(@)
 	# 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.
-	exec {valgrind} qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+	exec qw(valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
 	die "Failed to start valgrind: $!\n";
 }
 
@@ -190,6 +202,7 @@ sub dev_valdebug_unattended(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	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");
 
@@ -198,8 +211,6 @@ sub dev_valdebug_unattended(@)
 	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.
@@ -207,13 +218,18 @@ sub dev_valdebug_unattended(@)
 	my $pid = fork;
 	if ($pid == 0) {
 		POSIX::setsid();
-		use Fcntl;
 		-d $valgrindlogpath or mkdir $valgrindlogpath or die "Cannot create $valgrindlogpath: $!\n";
+		-e "$binpath/valgrind.sup" or do { open my $f, '>', "$binpath/valgrind.sup"; };
 		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} qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+	# 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.
+		exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
+			"--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
+			qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
+			"$binpath/$executable", qw(-nofork -debug -nolog), @_;
 		die "Can't execute valgrind: $!\n";
 	}
 }
@@ -223,6 +239,7 @@ sub dev_screenvaldebug(@)
 	# Check to see its not 'running' already.
 	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
 
+	chdir $runpath;
 	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");
 
@@ -234,7 +251,7 @@ sub dev_screenvaldebug(@)
 	# If we are still alive here.. Try starting the IRCd..
 	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
 	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
-	exec {screen} qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+	exec qw(screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
 	die "Failed to start screen: $!\n";
 }
 
@@ -244,18 +261,18 @@ sub cmd_stop()
 	# Get to here, we have something to kill.
 	my $pid = getprocessid();
 	print "Stopping InspIRCd (pid: $pid)...\n";
-	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 30 : 5;
+	my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 90 : 15;
 	kill TERM => $pid or die "Cannot terminate IRCd: $!\n";
 	for (1..$maxwait) {
 		sleep 1;
-		if (getstatus() == 1) {
+		if (getstatus() == 0) {
 			print "InspIRCd Stopped.\n";
 			return;
 		}
 	}
 	print "InspIRCd not dying quietly -- forcing kill\n";
 	kill KILL => $pid;
-	exit 0;
+	return 0;
 }
 
 ###
@@ -274,6 +291,8 @@ sub cmd_stop()
 # defined, but defined in a comment (line starts with #)
 # -- Brain
 
+my %filesparsed;
+
 sub getpidfile
 {
 	my ($file) = @_;
@@ -284,22 +303,15 @@ sub getpidfile
 	# Are We using a relative path?
 	if ($file !~ /^\//) {
 		# Convert it to a full path.
-		$file = $confpath . $file;
+		$file = $runpath .'/'. $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;
+	return if $filesparsed{$file};
+	$filesparsed{$file} = 1;
 
 	# Open the File..
-	open INFILE, "< $file" or die "Unable to open file $file included in configuration\n";
+	open INFILE, '<', $file or return;
 	# Grab entire file contents..
 	my(@lines) = <INFILE>;
 	# Close the file
@@ -307,7 +319,7 @@ sub getpidfile
 
 	# remove trailing spaces
 	chomp(@lines);
-	foreach $i (@lines) {
+	for my $i (@lines) {
 		# clean it up
 		$i =~ s/[^=]+=\s(.*)/\1/;
 		# Does this file have a pid?
@@ -315,12 +327,22 @@ sub getpidfile
 		{
 			# Set the PID file and return.
 			$pidfile = $1;
+			if (-f $pidfile)
+			{
+				return;
+			}
+			elsif (-f "$runpath/$pidfile")
+			{
+				$pidfile = "$runpath/$pidfile";
+				return;
+			}
 			return;
 		}
 	}
 
+
 	# If we get here, NO PID FILE! -- Check for includes
-	foreach $i (@lines) {
+	for my $i (@lines) {
 		$i =~ s/[^=]+=\s(.*)/\1/;
 		if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
 		{
@@ -335,7 +357,7 @@ sub getpidfile
 	}
 
 	# End of includes / No includes found. Using default.
-	$pidfile = $confpath . "inspircd.pid";
+	$pidfile = $runpath . "/data/inspircd.pid";
 }
 
 sub getstatus {
@@ -348,9 +370,9 @@ sub getstatus {
 sub getprocessid {
 	my $pid;
 	open PIDFILE, "< $pidfile" or return 0;
-	while($i = <PIDFILE>)
+	while(<PIDFILE>)
 	{
-		$pid = $i;
+		$pid = $_;
 	}
 	close PIDFILE;
 	return $pid;
@@ -396,6 +418,8 @@ sub cmd_checkconf()
 	exit 0;
 }
 
+my %filechecked;
+
 sub validateconf
 {
 	my ($file) = @_;
@@ -403,19 +427,12 @@ sub validateconf
 	# Are We using a relative path?
 	if ($file !~ /^\//) {
 		# Convert it to a full path..
-		$file = $confpath . $file;
+		$file = $runpath . $file;
 	}
 
 	# Have we checked this file before?
-	for (my $i = 0; $i < $filechecked; $i++) {
-		if ($filechecked[$i] eq $file) {
-			# Already Parsed, Possible recursive loop..
-			return;
-		}
-	}
-
-	# If we get here, Mark as 'Read'
-	$filechecked[$filechecked] = $file;
+	return if $filechecked{$file};
+	$filechecked{$file} = 1;
 
 	# Open the File..
 	open INFILE, "< $file" or die "Unable to open file $file\n";
@@ -435,7 +452,7 @@ sub validateconf
 #       push @newlines, "<!DOCTYPE config SYSTEM \"".$confpath."inspircd.dtd\">";
 	push @newlines, "<config>";
 
-	foreach $i (@lines)
+	for my $i (@lines)
 	{
 		# remove trailing newlines
 		chomp($i);
@@ -533,7 +550,7 @@ sub validateconf
 		$tmpfile = tmpnam();
 	} until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
 
-	foreach $n (@newlines)
+	for my $n (@newlines)
 	{
 		print TF "$n\n";
 	}
@@ -543,7 +560,7 @@ sub validateconf
 	chomp(@result);
 
 	my $skip = 0;
-	foreach $n (@result)
+	for my $n (@result)
 	{
 		if ($skip)
 		{