);
# array.
-use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache
+use vars qw(@ircServers @wingateBad @wingateNow @wingateCache
);
### hash. MUST BE REDUCED IN SIZE!!!
-#
+#
use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig
%nuh %talkWho %seen %floodwarn %param %dbh %ircPort
%topic %moduleAge %last %time %mask %file
- %forked %chanconf %channels
+ %forked %chanconf %channels %cache
);
# Signals.
$ucount_chanfile = 0;
$running = 0;
### more variables...
+# static scalar variables.
+$mask{ip} = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
+$mask{host} = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
+$mask{chan} = '[\#\&]\S*|_default';
+my $isnick1 = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
+my $isnick2 = '0-9\-';
+$mask{nick} = "[$isnick1]{1}[$isnick1$isnick2]*";
+$mask{nuh} = '\S*!\S*\@\S*';
$msgtime = time();
$msgsize = 0;
$msgcount = 0;
$notsize = 0;
$notcount = 0;
###
+$bot_release = "1.3.3";
if ( -d "CVS" ) {
use POSIX qw(strftime);
- $bot_release = strftime("cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
-} else {
- $bot_release = "1.0.10 (2001xxxx)";
+ $bot_release .= strftime(" cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
}
$bot_version = "blootbot $bot_release -- $^O";
$noreply = "NOREPLY";
### misc commands.
###
+sub whatInterface {
+ if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {
+ return "IRC";
+ } else {
+ return "CLI";
+ }
+}
+
sub doExit {
my ($sig) = @_;
&status("--- Start of quit.");
$ident ||= "blootbot"; # lame hack.
- &status("Memory Usage: $memusage kB");
+ &status("Memory Usage: $memusage KiB");
&closePID();
&closeStats();
}
&writeUserFile();
&writeChanFile();
- &uptimeWriteFile() if (&IsChanConf("uptime"));
+ &uptimeWriteFile() if (&IsParam('Uptime'));
&sqlCloseDB();
&closeSHM($shm);
- &dumpallvars() if (&IsParam("dumpvarsAtExit"));
+
+ if (&IsParam("dumpvarsAtExit")) {
+ &loadMyModule('DumpVars');
+ &dumpallvars();
+ }
&symdumpAll() if (&IsParam("symdumpAtExit"));
&closeLog();
&closeSQLDebug() if (&IsParam("SQLDebug"));
foreach (keys %chanconf) {
my $chan = $_;
-# &DEBUG("chan => $chan");
my @array = grep /^$param$/, keys %{ $chanconf{$chan} };
+ #&DEBUG("gCCL param => $param, chan => $chan, keys => " . join(':',keys %{ $chanconf{$chan} }) . " array => " . join(':', @array)) if ($param eq 'whatever');
next unless (scalar @array);
&WARN("multiple items found?");
}
- if ($array[0] eq "0") {
+ if ($chanconf{$chan}{$param} eq "0") {
$chan{$chan} = -1;
} else {
$chan{$chan} = 1;
# 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! :)
+
+ # knocked tons of bugs with this! :)
+ my $debug = 0; # 1 if ($param eq "whatever");
if (!defined $param) {
&WARN("IsChanConf: param == NULL.");
return 0;
}
- # should we use IsParam() externally where needed or hack it in
- # here just in case? fix it later.
+ # these should get moved to your .chan file instead of the .config
+ # .config items overide any .chan entries
if (&IsParam($param)) {
- &DEBUG("ICC: found '$param' option in main config file.");
+ &WARN("ICC: found '$param' option in main config file.");
return 1;
}
- $chan ||= "_default";
+ $chan ||= "_default";
my $old = $chan;
if ($chan =~ tr/A-Z/a-z/) {
}
### debug purposes only.
-# &DEBUG("param => $param, msgType => $msgType.");
-# foreach (keys %chan) {
-# &DEBUG(" $_ => $chan{$_}");
+# if ($debug) {
+# &DEBUG("param => $param, msgType => $msgType.");
+# foreach (keys %chan) {
+# &DEBUG(" $_ => $chan{$_}");
+# }
# }
if ($nomatch) {
} else {
&DEBUG("ICC: other: 0 ($param)") if ($debug);
}
-
return $chan{$chan} || $chan{_default} || 0;
- }
-
- if ($msgType eq "public") {
+ } elsif ($msgType =~ /^(public|private)$/i) {
if ($chan{$chan}) {
- &DEBUG("ICC: public: $chan{$chan} ($chan/$param)") if ($debug);
+ &DEBUG("ICC: $msgType: $chan{$chan} ($chan/$param)") if ($debug);
} elsif ($chan{_default}) {
- &DEBUG("ICC: public: $chan{_default} (_default/$param)") if ($debug);
+ &DEBUG("ICC: $msgType: $chan{_default} (_default/$param)") if ($debug);
} else {
- &DEBUG("ICC: public: 0 ($param)") if ($debug);
+ &DEBUG("ICC: $msgType: 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;
}
return 0;
}
- # this looks evil...
+ # 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;
+ $c = "_default" if ($c eq "*"); # FIXME
+ my @c = grep /^\Q$c\E$/i, keys %chanconf;
if (@c) {
if (0 and $c[0] ne $c) {
&WARN("c ne chan ($c[0] ne $chan)");
}
+ if (!defined $chanconf{$c[0]}{$param} and ($c ne '_default')) {
+ return &getChanConf($param, '_default');
+ }
+ #&DEBUG("gCC: $param,$c \"" . $chanconf{$c[0]}{$param} . '"');
return $chanconf{$c[0]}{$param};
}
-# &DEBUG("gCC: returning _default... ");
+ #&DEBUG("gCC: returning _default... " . $chanconf{"_default"}{$param});
return $chanconf{"_default"}{$param};
}
sub getChanConfDefault {
my($what, $default, $chan) = @_;
-
$chan ||= "_default";
if (exists $param{$what}) {
if (!exists $cache{config}{$what}) {
- &status("Config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead");
+ &status("config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead of chan option");
$cache{config}{$what} = 1;
}
return $val if (defined $val);
$param{$what} = $default;
- &status("Config ($chan): auto-setting param{$what} = $default");
+ &status("config ($chan): auto-setting param{$what} = $default");
$cache{config}{$what} = 1;
return $default;
}
if ($delta == 0) {
return;
} elsif ($delta > 500) {
- $str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
+ $str = "MEM:$prefix increased by $delta KiB. (total: $memusage KiB)";
} elsif ($delta > 0) {
- $str = "MEM:$prefix increased by $delta kB";
+ $str = "MEM:$prefix increased by $delta KiB";
} else { # delta < 0.
$delta = -$delta;
# never knew RSS could decrease, probably Size can't?
- $str = "MEM:$prefix decreased by $delta kB.";
+ $str = "MEM:$prefix decreased by $delta KiB.";
}
&status($str);
&checkTables();
&status("Setup: ". &countKeys("factoids") ." factoids.");
- &getChanConfDefault("sendPrivateLimitLines", 3);
- &getChanConfDefault("sendPrivateLimitBytes", 1000);
- &getChanConfDefault("sendPublicLimitLines", 3);
- &getChanConfDefault("sendPublicLimitBytes", 1000);
- &getChanConfDefault("sendNoticeLimitLines", 3);
- &getChanConfDefault("sendNoticeLimitBytes", 1000);
+ &getChanConfDefault("sendPrivateLimitLines", 3, $chan);
+ &getChanConfDefault("sendPrivateLimitBytes", 1000, $chan);
+ &getChanConfDefault("sendPublicLimitLines", 3, $chan);
+ &getChanConfDefault("sendPublicLimitBytes", 1000, $chan);
+ &getChanConfDefault("sendNoticeLimitLines", 3, $chan);
+ &getChanConfDefault("sendNoticeLimitBytes", 1000, $chan);
$param{tempDir} =~ s#\~/#$ENV{HOME}/#;
- &status("Initial memory usage: $memusage kB");
+ &status("Initial memory usage: $memusage KiB");
&status("-------------------------------------------------------");
}
sub startup {
if (&IsParam("DEBUG")) {
&status("enabling debug diagnostics.");
- ### I thought disabling this reduced memory usage by 1000 kB.
+ # I thought disabling this reduced memory usage by 1000 KiB.
use diagnostics;
}
# reverse order of &setup().
&status("--- shutdown called.");
- $ident ||= "blootbot"; # hack.
+ # hack.
+ $ident ||= "blootbot";
- if ($sig eq "HUP") {
- &status("::: not writing user/chan file w/ SIGHUP");
- } else {
- &writeUserFile();
+ if (!&isFileUpdated("$bot_state_dir/blootbot.users", $wtime_userfile)) {
+ &writeUserFile()
+ }
+
+ if (!&isFileUpdated("$bot_state_dir/blootbot.chan", $wtime_chanfile)) {
&writeChanFile();
}
&sqlCloseDB();
- &closeSHM($shm); # aswell. TODO: use this in &doExit?
+ # aswell. TODO: use this in &doExit?
+ &closeSHM($shm);
&closeLog();
}