X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=90ac30f026379646a03bd3500f475b27a881b860;hb=5a6b7405140f17a0bc6cf5e7bb3d85a02f1eae88;hp=b1c084fd52d6712e3af3eb5247cce33e69c3becb;hpb=893a6f6711e298eda86d8696093bf223c431729f;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index b1c084fd..90ac30f0 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -37,7 +37,6 @@ use DXProtHandle; use strict; -use vars qw($VERSION $BRANCH); use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime $last_hour $last10 %eph %pings %rcmds $ann_to_talk $pingint $obscount %pc19list $chatdupeage $chatimportfn @@ -48,8 +47,6 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim %pc92_find $pc92_find_timeout ); -($VERSION, $BRANCH) = dxver(q$Revision$); - $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 $pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23 @@ -1173,7 +1170,7 @@ sub talk } else { $self->send(pc10($from, $to, $via, $line, $origin)); } - Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall; + Log('talk', $to, $from, '>' . ($via || $origin || $self->call), $line) unless $origin && $origin ne $main::mycall; } # send it if it isn't the except list and isn't isolated and still has a hop count