X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=e1b1ea45b0fc5c3b87d01fdd6c767f4d17b6ec15;hb=7e3729a9039462c460dae4804f40c0bd506f3423;hp=fe7af2dd7b24d7e8ddc20fbdf02f4e4ee01c1886;hpb=d0b55caa8a609da9ccc5ea59bb376795a99d04b5;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index fe7af2dd..e1b1ea45 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -33,6 +33,7 @@ use Route; use Route::Node; use Script; use DXProtHandle; +use DXCIDR; use Time::HiRes qw(gettimeofday tv_interval); use DXSubprocess; @@ -297,9 +298,9 @@ sub start # log it my $host = $self->{conn}->peerhost; $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport}; + $host ||= $host if is_ipaddr($host); $host ||= "unknown"; $self->{hostname} = $host if is_ipaddr($host); - Log('DXProt', "$call connected from $host"); # remember type of connection @@ -738,6 +739,7 @@ sub send_announce } Log('ann', $target, $from, $text); + AnnTalk::add_anncache('ann', $target, $from, $text); # send it if it isn't the except list and isn't isolated and still has a hop count # taking into account filtering and so on @@ -1777,6 +1779,8 @@ sub import_chat my $via = $target; $via = '*' if $target eq 'ALL' || $target eq 'SYSOP'; Log('ann', $target, $main::mycall, $text); + AnnTalk::add_anncache('ann', $target, $main::mycall, $text); + $main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text)); } else { DXCommandmode::send_chats($main::me, $target, $text);