X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=96a51f5dce89703f306e16f7240f54a01359462d;hb=84f339800c18bbc7c156d72c790d76a84cd657b8;hp=b1c084fd52d6712e3af3eb5247cce33e69c3becb;hpb=893a6f6711e298eda86d8696093bf223c431729f;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index b1c084fd..96a51f5d 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 @@ -297,6 +294,12 @@ sub start $self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1); $self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1); $self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate}; + # if there is no route input filter then specify a default one. + # obviously this can be changed later by the sysop. + if (!$self->{inroutefilter}) { + my $dxcc = $self->dxcc; + $Route::filterdef->cmd($self, 'route', 'accept', "input by_dxcc $dxcc" ); + } # set unbuffered and no echo $self->send_now('B',"0"); @@ -1173,7 +1176,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