}
next unless (exists $ircPort{$host});
- my $retval = &irc($host, $ircPort{$host});
- &DEBUG("ircloop: after irc()");
-
+ my $retval = &irc($host, $ircPort{$host});
next unless (defined $retval and $retval == 0);
-
$error++;
if ($error % 3 == 0 and $error != 0) {
- &ERROR("CANNOT connect to this server; next!");
+ &status("IRC: Could not connect.");
+ &status("IRC: ");
next;
}
- if ($error >= 3*3) {
- &ERROR("CANNOT connect to any irc server; stopping.");
+ if ($error >= 3*2) {
+ &status("IRC: cannot connect to any IRC servers; stopping.");
+ &shutdown();
exit 1;
}
}
- &DEBUG("ircloop: end... going back.");
+ &status("IRC: ok, done one cycle of IRC servers; trying again.");
+
&loadIRCServers();
goto loop;
}
$irc = new Net::IRC;
- $conn = $irc->newconn(
+ my %args = (
Nick => $param{'ircNick'},
Server => $server,
Port => $port,
Ircname => $param{'ircName'},
- LocalAddr => $param{'ircHost'},
);
+ $args{'LocalAddr'} = $param{'ircHost'} if ($param{'ircHost'});
+
+ $conn = $irc->newconn(%args);
if (!defined $conn) {
&ERROR("irc: conn was not created!defined!!!");
# change internal timeout value for scheduler.
$irc->{_timeout} = 10; # how about 60?
+ # Net::IRC debugging.
+ $irc->{_debug} = 1;
$ircstats{'Server'} = "$server:$port";
$conn->add_global_handler('disconnect', \&on_disconnect);
$conn->add_global_handler([251,252,253,254,255], \&on_init);
### $conn->add_global_handler([251,252,253,254,255,302], \&on_init);
+ $conn->add_global_handler(315, \&on_endofwho);
$conn->add_global_handler(324, \&on_modeis);
$conn->add_global_handler(333, \&on_topicinfo);
$conn->add_global_handler(352, \&on_who);
$pubcount++;
$pubsize += length $msg;
- if ( ($pubcount % 4) == 0 and $pubcount) {
+ my $i = &getChanConfDefault("sendPublicLimitLines", 3);
+ my $j = &getChanConfDefault("sendPublicLimitBytes", 1000);
+
+ if ( ($pubcount % $i) == 0 and $pubcount) {
sleep 1;
- } elsif ($pubsize > 1500) {
+ $pubsleep++;
+ } elsif ($pubsize > $j) {
sleep 1;
- $pubsize -= 1500;
+ $pubsize -= $j;
+ $pubsleep++;
}
} else {
$msgcount++;
$msgsize += length $msg;
- if ( ($msgcount % 4) == 0 and $msgcount) {
+ my $i = &getChanConfDefault("sendPrivateLimitLines", 3);
+ my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000);
+ if ( ($msgcount % $i) == 0 and $msgcount) {
sleep 1;
- } elsif ($msgsize > 1000) {
+ $msgsleep++;
+ } elsif ($msgsize > $j) {
sleep 1;
- $msgsize -= 1000;
+ $msgsize -= $j;
+ $msgsleep++;
}
} else {
$notcount++;
$notsize += length $txt;
- if ( ($notcount % 3) == 0 and $notcount) {
+ my $i = &getChanConfDefault("sendNoticeLimitLines", 3);
+ my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000);
+
+ if ( ($notcount % $i) == 0 and $notcount) {
sleep 1;
- } elsif ($notsize > 1000) {
+ $notsleep++;
+ } elsif ($notsize > $j) {
sleep 1;
- $notsize -= 1000;
+ $notsize -= $j;
+ $notsleep++;
}
} else {
$conn->notice($target, $txt);
}
-
sub DCCBroadcast {
my ($txt,$flag) = @_;
sub quit {
my ($quitmsg) = @_;
&status("QUIT $param{'ircNick'} has quit IRC ($quitmsg)");
- $conn->quit($quitmsg);
+ if (defined $conn) {
+ $conn->quit($quitmsg);
+ } else {
+ &WARN("quit: could not quit!");
+ }
}
sub nick {
my ($nick) = @_;
+ if (!defined $nick) {
+ &ERROR("nick: nick == NULL.");
+ return;
+ }
+
+ if (defined $ident and $nick eq $ident) {
+ &WARN("nick: nick == ident == '$ident'.");
+ }
+
+ my $bad = 0;
+ $bad++ if (exists $nuh{ $param{'ircNick'} });
+ $bad++ if (&IsNickInAnyChan($param{'ircNick'}));
+
+ if ($bad) {
+ &WARN("Nick: not going to try and get my nick back. [".
+ scalar(localtime). "]");
+ return;
+ }
+
if ($nick =~ /^$mask{nick}$/) {
- &DEBUG("nick: Changing nick to $nick (from $ident)");
rawout("NICK ".$nick);
- # unfortunately, on_nick doesn't catch ourself.
- $ident = $nick;
+
+ if (defined $ident) {
+ &status("nick: Changing nick to $nick (from $ident)");
+ } else {
+ &DEBUG("first time nick change.");
+ $ident = $nick;
+ }
+
return 1;
}
&DEBUG("nick: failed... why oh why (nick => $nick)");
# Usage: &joinNextChan();
sub joinNextChan {
- &DEBUG("joinNextChan called.");
-
if (scalar @joinchan) {
$chan = shift @joinchan;
&joinchan($chan);
&status("joinNextChan: $i chans to join.");
}
- } else {
- if (exists $cache{joinTime}) {
- my $delta = time() - $cache{joinTime};
- my $timestr = &Time2String($delta);
- my $rate = sprintf("%.1f", $delta / &getJoinChans() );
- delete $cache{joinTime};
+ return;
- &DEBUG("time taken to join all chans: $timestr; rate: $rate sec/join");
- }
- # chanserv check: global channels, in case we missed one.
+ }
- foreach ( &ChanConfList("chanServ_ops") ) {
- &chanServCheck($_);
- }
+ # !scalar @joinchan:
+ my @c = &getJoinChans();
+ if (exists $cache{joinTime} and scalar @c) {
+ my $delta = time() - $cache{joinTime} - 5;
+ my $timestr = &Time2String($delta);
+ my $rate = sprintf("%.1f", $delta / @c);
+ delete $cache{joinTime};
+
+ &DEBUG("time taken to join all chans: $timestr; rate: $rate sec/join");
+ }
+
+ # chanserv check: global channels, in case we missed one.
+ foreach ( &ChanConfList("chanServ_ops") ) {
+ &chanServCheck($_);
}
}
-# Usage: &GetNickInChans($nick,$chan);
-sub GetNickInChans {
+# Usage: &getNickInChans($nick);
+sub getNickInChans {
my ($nick) = @_;
my @array;
return @array;
}
-# Usage: &GetNicksInChan($chan);
-sub GetNicksInChan {
+# Usage: &getNicksInChan($chan);
+sub getNicksInChan {
my ($chan) = @_;
my @array;
}
###
-# Usage: &DeleteUserInfo($nick,@chans);
-sub DeleteUserInfo {
+# Usage: &delUserInfo($nick,@chans);
+sub delUserInfo {
my ($nick,@chans) = @_;
my ($mode,$chan);
}
sub clearIRCVars {
-### &DEBUG("clearIRCVars() called!");
+# &DEBUG("clearIRCVars() called!");
undef %channels;
undef %floodjoin;
my $str;
if (scalar @skip) {
- $str = "gJC: channels not auto-joining: @skip";
+ $str = "channels not auto-joining: @skip (joining: @chans)";
} else {
- $str = "gJC: auto-joining all chans.";
+ $str = "auto-joining all chans: @chans";
}
- &status($str) if ($show);
+ &status("Chans: ".$str) if ($show);
return @chans;
}
projects / infobot.git / blobdiff