X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fcore.pl;h=e8975c136a799f11219e10e071d3de9d85c8fbd0;hb=c68ac9b2d4b88535c1a2cfa695f6c4f683f0373c;hp=9e4add76a6cafb2cb6b2013db5421a70553e3aeb;hpb=ee318e10176aed823981d0f194755218cc27b0a8;p=infobot.git

diff --git a/src/core.pl b/src/core.pl
index 9e4add7..e8975c1 100644
--- a/src/core.pl
+++ b/src/core.pl
@@ -10,22 +10,32 @@ use strict;
 # dynamic scalar. MUST BE REDUCED IN SIZE!!!
 ### TODO: reorder.
 use vars qw(
-	$answer $correction_plausible $talkchannel
+	$bot_misc_dir $bot_pid $bot_base_dir $bot_src_dir
+	$bot_data_dir $bot_config_dir $bot_state_dir $bot_run_dir
+	$answer $correction_plausible $talkchannel $bot_release
 	$statcount $memusage $user $memusageOld $bot_version $dbh
-	$shm $host $msg $bot_misc_dir $bot_pid $bot_base_dir $noreply
-	$bot_src_dir $conn $irc $learnok $nick $ident $no_syscall
+	$shm $host $msg $noreply $conn $irc $learnok $nick $ident
 	$force_public_reply $addrchar $userHandle $addressedother
 	$floodwho $chan $msgtime $server $firsttime $wingaterun
+	$flag_quit $msgType $no_syscall
+	$utime_userfile	$wtime_userfile	$ucount_userfile
+	$utime_chanfile	$wtime_chanfile	$ucount_chanfile
+	$pubsize $pubcount $pubtime
+	$msgsize $msgcount $msgtime
+	$notsize $notcount $nottime
+	$running
 );
 
 # dynamic hash.
 use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache
 );
 
-# dynamic hash. MUST BE REDUCED IN SIZE!!!
+### dynamic hash. MUST BE REDUCED IN SIZE!!!
+# 
 use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig
-	    %nuh %talkWho %seen %floodwarn %param %dbh %ircPort %userList
-	    %jointime %topic %joinverb %moduleAge %last %time %mask %file
+	    %nuh %talkWho %seen %floodwarn %param %dbh %ircPort
+	    %topic %moduleAge %last %time %mask %file
+	    %forked %chanconf %channels
 );
 
 # Signals.
@@ -40,12 +50,33 @@ $last{buflen}	= 0;
 $last{say}	= "";
 $last{msg}	= "";
 $userHandle	= "default";
-$msgtime	= time();
 $wingaterun	= time();
 $firsttime	= 1;
-
-### CHANGE TO STATIC.
-$bot_version = "blootbot cvs (20001212) -- $^O";
+$utime_userfile	= 0;
+$wtime_userfile	= 0;
+$ucount_userfile = 0;
+$utime_chanfile	= 0;
+$wtime_chanfile	= 0;
+$ucount_chanfile = 0;
+$running	= 0;
+### more variables...
+$msgtime	= time();
+$msgsize	= 0;
+$msgcount	= 0;
+$pubtime	= 0;
+$pubsize	= 0;
+$pubcount	= 0;
+$nottime	= 0;
+$notsize	= 0;
+$notcount	= 0;
+###
+if ( -d "CVS" ) {
+    use POSIX qw(strftime);
+    $bot_release	= strftime("cvs (%Y%m%d)", localtime( (stat("CVS"))[9] ) );
+} else {
+    $bot_release	= "1.0.10 (2001xxxx)";
+}
+$bot_version	= "blootbot $bot_release -- $^O";
 $noreply	= "NOREPLY";
 
 ##########
@@ -53,24 +84,38 @@ $noreply	= "NOREPLY";
 ###
 
 sub doExit {
-    my ($sig) = @_;
+    my ($sig)	= @_;
+
+    if (defined $flag_quit) {
+	&WARN("doExit: quit already called.");
+	return;
+    }
+    $flag_quit	= 1;
 
     if (!defined $bot_pid) {	# independent.
 	exit 0;
     } elsif ($bot_pid == $$) {	# parent.
 	&status("parent caught SIG$sig (pid $$).") if (defined $sig);
 
-	my $type;
+	&status("--- Start of quit.");
+	$ident ||= "blootbot";	# lame hack.
+
 	&closeDCC();
 	&closePID();
+	&closeStats();
 	&seenFlush();
 	&quit($param{'quitMsg'}) if (&whatInterface() =~ /IRC/);
-	&uptimeWriteFile();
+	&writeUserFile();
+	&writeChanFile();
+	&uptimeWriteFile()	if (&ChanConfList("uptime"));
+	&News::writeNews()	if (&ChanConfList("news"));
 	&closeDB();
 	&closeSHM($shm);
-	&dumpallvars()  if (&IsParam("dumpvarsAtExit"));
+	&dumpallvars()		if (&IsParam("dumpvarsAtExit"));
 	&closeLog();
 	&closeSQLDebug()	if (&IsParam("SQLDebug"));
+
+	&status("--- QUIT.");
     } else {					# child.
 	&status("child caught SIG$sig (pid $$).");
     }
@@ -85,10 +130,11 @@ sub doWarn {
 	&WARN("PERL: $_");
     }
 
-    $SIG{__WARN__} = 'doWarn';
+    $SIG{__WARN__} = 'doWarn';	# ???
 }
 
 # Usage: &IsParam($param);
+# blootbot.config specific.
 sub IsParam {
     my $param = $_[0];
 
@@ -99,6 +145,188 @@ sub IsParam {
     return 1;
 }
 
+#####
+#  Usage: &ChanConfList($param)
+#  About: gets channels with 'param' enabled. (!!!)
+# Return: array of channels
+sub ChanConfList {
+    my $param	= $_[0];
+    return unless (defined $param);
+    my %chan	= &getChanConfList($param);
+
+    if (exists $chan{_default}) {
+	return keys %chanconf;
+    } else {
+	return keys %chan;
+    }
+}
+
+#####
+#  Usage: &getChanConfList($param)
+#  About: gets channels with 'param' enabled, internal use only.
+# Return: hash of channels
+sub getChanConfList {
+    my $param	= $_[0];
+    my %chan;
+
+    return unless (defined $param);
+
+    foreach (keys %chanconf) {
+	my $chan	= $_;
+#	&DEBUG("chan => $chan");
+	my @array	= grep /^$param$/, keys %{ $chanconf{$chan} };
+
+	next unless (scalar @array);
+
+	if (scalar @array > 1) {
+	    &WARN("multiple items found?");
+	}
+
+	if ($array[0] eq "0") {
+	    $chan{$chan}	= -1;
+	} else {
+	    $chan{$chan}	=  1;
+	}
+    }
+
+    return %chan;
+}
+
+#####
+#  Usage: &IsChanConf($param);
+#  About: Check for 'param' on the basis of channel config.
+# Return: 1 for enabled, 0 for passive disable, -1 for active disable.
+sub IsChanConf {
+    my($param)	= shift;
+    my $debug	= 0;	# knocked tons of bugs with this! :)
+
+    if (!defined $param) {
+	&WARN("IsChanConf: param == NULL.");
+	return 0;
+    }
+
+    $chan	||= "_default";
+
+    my $old = $chan;
+    if ($chan =~ tr/A-Z/a-z/) {
+	&WARN("IsChanConf: lowercased chan. ($old)");
+    }
+
+    ### TODO: VERBOSITY on how chanconf returned 1 or 0 or -1.
+    my %chan	= &getChanConfList($param);
+    my $nomatch = 0;
+    if (!defined $msgType) {
+	$nomatch++;
+    } else {
+	$nomatch++ if ($msgType eq "");
+	$nomatch++ unless ($msgType =~ /^(public|private)$/i);
+    }
+
+### debug purposes only.
+#    &DEBUG("param => $param, msgType => $msgType.");
+#    foreach (keys %chan) {
+#	&DEBUG("   $_ => $chan{$_}");
+#    }
+
+    if ($nomatch) {
+	if ($chan{$chan}) {
+	    &DEBUG("ICC: other: $chan{$chan} (_default/$param)") if ($debug);
+	} elsif ($chan{_default}) {
+	    &DEBUG("ICC: other: $chan{_default} (_default/$param)") if ($debug);
+	} else {
+	    &DEBUG("ICC: other: 0 ($param)") if ($debug);
+	}
+
+	return $chan{$chan} || $chan{_default} || 0;
+    }
+
+    if ($msgType eq "public") {
+	if ($chan{$chan}) {
+	    &DEBUG("ICC: public: $chan{$chan} ($chan/$param)") if ($debug);
+	} elsif ($chan{_default}) {
+	    &DEBUG("ICC: public: $chan{_default} (_default/$param)") if ($debug);
+	} else {
+	    &DEBUG("ICC: public: 0 ($param)") if ($debug);
+	}
+
+	return $chan{$chan} || $chan{_default} || 0;
+    }
+
+    if ($msgType eq "private") {
+	if ($chan{_default}) {
+	    &DEBUG("ICC: private: $chan{_default} (_default/$param)") if ($debug);
+	} elsif ($chan{$chan}) {
+	    &DEBUG("ICC: private: $chan{$chan} ($chan/$param) (hack)") if ($debug);
+	} else {
+	    &DEBUG("ICC: private: 0 ($param)") if ($debug);
+	}
+
+	return $chan{$chan} || $chan{_default} || 0;
+    }
+
+    &DEBUG("ICC: no-match: 0/$param (msgType = $msgType)");
+
+    return 0;
+}
+
+#####
+#  Usage: &getChanConf($param);
+#  About: Retrieve value for 'param' value in current/default chan.
+# Return: scalar for success, undef for failure.
+sub getChanConf {
+    my($param,$c)	= @_;
+
+    if (!defined $param) {
+	&WARN("param == NULL.");
+	return 0;
+    }
+
+    # this looks evil... 
+    if (0 and !defined $chan) {
+	&DEBUG("gCC: ok !chan... doing _default instead.");
+    }
+
+    $c		||= $chan;
+    $c		||= "_default";
+    $c		= "_default" if ($c eq "*");	# fix!
+    my @c	= grep /^$c$/i, keys %chanconf;
+
+    if (@c) {
+	if (0 and $c[0] ne $c) {
+	    &WARN("c ne chan ($c[0] ne $chan)");
+	}
+	return $chanconf{$c[0]}{$param};
+    }
+
+#    &DEBUG("gCC: returning _default... ");
+    return $chanconf{"_default"}{$param};
+}
+
+#####
+#  Usage: &findChanConf($param);
+#  About: Retrieve value for 'param' value from any chan.
+# Return: scalar for success, undef for failure.
+sub findChanConf {
+    my($param)	= @_;
+
+    if (!defined $param) {
+	&WARN("param == NULL.");
+	return 0;
+    }
+
+    my $c;
+    foreach $c (keys %chanconf) {
+	foreach (keys %{ $chanconf{$c} }) {
+	    next unless (/^$param$/);
+
+	    &DEBUG("chanconf{$c}{$_} ...");
+	    return $chanconf{$c}{$_};
+	}
+    }
+
+    return;
+}
+
 sub showProc {
     my ($prefix) = $_[0] || "";
 
@@ -113,31 +341,37 @@ sub showProc {
 	}
 	close IN;
 
-	if (defined $memusageOld and &IsParam("DEBUG")) {
-	    # it's always going to be increase.
-	    my $delta = $memusage - $memusageOld;
-	    my $str;
-	    if ($delta == 0) {
-		return;
-	    } elsif ($delta > 500) {
-		$str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
-	    } elsif ($delta > 0) {
-		$str = "MEM:$prefix increased by $delta kB";
-	    } else {	# delta < 0.
-		$delta = -$delta;
-		# never knew RSS could decrease, probably Size can't?
-		$str = "MEM:$prefix decreased by $delta kB. YES YES YES";
-	    }
-
-	    &status($str);
-	    &DCCBroadcast($str) if (&whatInterface() =~ /IRC/ &&
-		grep(/Irc.pl/, keys %moduleAge));
-	}
-	$memusageOld = $memusage;
+    } elsif ($^O eq "netbsd") {
+	$memusage = (stat "/proc/$$/mem")[7]/1024;
+
+    } elsif ($^O =~ /^(free|open)bsd$/) {
+	my @info  = split /\s+/, `/bin/ps -l -p $$`;
+	$memusage = $info[20];
+
     } else {
 	$memusage = "UNKNOWN";
+	return;
+    }
+
+    if (defined $memusageOld and &IsParam("DEBUG")) {
+	# it's always going to be increase.
+	my $delta = $memusage - $memusageOld;
+	my $str;
+	if ($delta == 0) {
+	    return;
+	} elsif ($delta > 500) {
+	    $str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
+	} elsif ($delta > 0) {
+	    $str = "MEM:$prefix increased by $delta kB";
+	} else {	# delta < 0.
+	    $delta = -$delta;
+	    # never knew RSS could decrease, probably Size can't?
+	    $str = "MEM:$prefix decreased by $delta kB. YES YES YES";
+	}
+
+	&status($str);
     }
-    ### TODO: FreeBSD/*BSD support.
+    $memusageOld = $memusage;
 }
 
 ######
@@ -147,6 +381,7 @@ sub showProc {
 sub setup {
     &showProc(" (\&openLog before)");
     &openLog();		# write, append.
+    &status("--- Started logging.");
 
     foreach ("debian") {
 	my $dir = "$bot_base_dir/$_/";
@@ -156,36 +391,35 @@ sub setup {
     }
 
     # read.
-    &loadIgnore($bot_misc_dir.		"/blootbot.ignore");
-    &loadLang($bot_misc_dir.		"/blootbot.lang");
-    &loadIRCServers($bot_misc_dir.	"/ircII.servers");
-    &loadUsers($bot_misc_dir.		"/blootbot.users");
-    if (&IsParam("WIP")) {
-	require "src/UserFile.pl";
-	&NEWloadUsers($bot_misc_dir."/blootbot.users_NEW");
-	&closePID();
-	&closeLog();
-	exit 0;
-    }
+    &loadLang($bot_data_dir. "/blootbot.lang");
+    &loadIRCServers();
+    &readUserFile();
+    &readChanFile();
+    &loadMyModulesNow();	# must be after chan file.
 
     $shm = &openSHM();
     &openSQLDebug()	if (&IsParam("SQLDebug"));
     &openDB($param{'DBName'}, $param{'SQLUser'}, $param{'SQLPass'});
+    &checkTables();
 
     &status("Setup: ". &countKeys("factoids") ." factoids.");
+    &News::readNews() if (&ChanConfList("news"));
+    &getChanConfDefault("sendPrivateLimitLines", 3);
+    &getChanConfDefault("sendPrivateLimitBytes", 1000);
+    &getChanConfDefault("sendPublicLimitLines", 3);
+    &getChanConfDefault("sendPublicLimitBytes", 1000);
+    &getChanConfDefault("sendNoticeLimitLines", 3);
+    &getChanConfDefault("sendNoticeLimitBytes", 1000);
 
     $param{tempDir} =~ s#\~/#$ENV{HOME}/#;
 
     &status("Initial memory usage: $memusage kB");
+    &status("-------------------------------------------------------");
 }
 
 sub setupConfig {
     $param{'VERBOSITY'} = 1;
-    &loadConfig($bot_misc_dir."/blootbot.config");
-    if (&IsParam("WIP")) {
-	require "src/Config.pl";
-	&NEWloadConfig();
-    }
+    &loadConfig($bot_config_dir."/blootbot.config");
 
     foreach ("ircNick", "ircUser", "ircName", "DBType", "tempDir") {
 	next if &IsParam($_);
@@ -194,7 +428,7 @@ sub setupConfig {
     }
 
     if ($param{tempDir} =~ s#\~/#$ENV{HOME}/#) {
-	&status("Fixing up tempDir.");
+	&VERB("Fixing up tempDir.",2);
     }
 
     if ($param{tempDir} =~ /~/) {
@@ -208,8 +442,8 @@ sub setupConfig {
     }
 
     # static scalar variables.
-    $file{utm}	= "$bot_base_dir/$param{'ircUser'}.uptime";
-    $file{PID}	= "$bot_base_dir/$param{'ircUser'}.pid";
+    $file{utm}	= "$bot_state_dir/$param{'ircUser'}.uptime";
+    $file{PID}	= "$bot_run_dir/$param{'ircUser'}.pid";
 }
 
 sub startup {
@@ -222,12 +456,21 @@ sub startup {
     $count{'Question'}	= 0;
     $count{'Update'}	= 0;
     $count{'Dunno'}	= 0;
-
-    &loadMyModulesNow();
+    $count{'Moron'}	= 0;
 }
 
 sub shutdown {
     # reverse order of &setup().
+    &status("--- shutdown called.");
+
+    $ident ||=	"blootbot";	# hack.
+
+    # opened files must be written to on shutdown/hup/whatever
+    # unless they're write-only, like uptime.
+    &writeUserFile();
+    &writeChanFile();
+    &News::writeNews()	if (&ChanConfList("news"));
+
     &closeDB();
     &closeSHM($shm);	# aswell. TODO: use this in &doExit?
     &closeLog();
@@ -241,14 +484,18 @@ sub restart {
 
 	### crappy bug in Net::IRC?
 	if (!$conn->connected and time - $msgtime > 900) {
-	    &status("reconnecting because of uncaught disconnect.");
-##	    $irc->start;
+	    &status("reconnecting because of uncaught disconnect \@ ".scalar(localtime) );
+###	    $irc->start;
+	    &clearIRCVars();
 	    $conn->connect();
-	    return;
+###	    return;
 	}
 
+	&ircCheck();	# heh, evil!
+
+	&DCCBroadcast("-HUP called.","m");
 	&shutdown();
-	&loadConfig($bot_misc_dir."/blootbot.config");
+	&loadConfig($bot_config_dir."/blootbot.config");
 	&reloadAllModules() if (&IsParam("DEBUG"));
 	&setup();
 
@@ -264,8 +511,7 @@ sub loadConfig {
 
     if (!open(FILE, $file)) {
 	&ERROR("FAILED loadConfig ($file): $!");
-	&status("Please copy files/sample.config to files/blootbot.config");
-	&status("  and edit files/blootbot.config, modify to tastes.");
+	&status("Please read the INSTALL file on how to install and setup this file.");
 	exit 0;
     }