X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=3681bfbf35fee93b3c8fbbe96baf3bf716a1460a;hb=6a510dc82f3050640dfe6b8d499995348075fe7a;hp=f8e2b4b99ee9d0c85c1f1a8d75880fde8f5b6b0c;hpb=aaf98478dc930b9d337c85c41316a926046d7ae2;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index f8e2b4b9..3681bfbf 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -208,7 +208,7 @@ sub new # add this node to the table, the values get filled in later my $pkg = shift; my $call = shift; - $main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall; + $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall; return $self; } @@ -238,6 +238,9 @@ sub start $self->{here} = 1; $self->{width} = 80; + # sort out registration + $self->{registered} = 1; + # get the output filters $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0); $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0); @@ -256,6 +259,7 @@ sub start # set unbuffered and no echo $self->send_now('B',"0"); $self->send_now('E',"0"); + $self->conn->echo(0) if $self->conn->can('echo'); # ping neighbour node stuff my $ping = $user->pingint; @@ -392,7 +396,7 @@ sub normal } # rsfp check - return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]); +# return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]); # if this is a 'nodx' node then ignore it if ($badnode->in($field[7])) { @@ -415,7 +419,7 @@ sub normal } # is it 'baddx' - if ($baddx->in($field[2])) { + if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) { dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); return; } @@ -427,10 +431,6 @@ sub normal dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr'); return; } - if (Spot::dup($field[1], $field[2], $d, $field[5])) { - dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); - return; - } if ($censorpc) { my @bad; if (@bad = BadWords::check($field[5])) { @@ -449,6 +449,11 @@ sub normal } } + if (Spot::dup($field[1], $field[2], $d, $field[5])) { + dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); + return; + } + # add it Spot::add(@spot); @@ -524,14 +529,10 @@ sub normal if ($pcno == 12) { # announces - return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]); +# return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]); # announce duplicate checking $field[3] =~ s/^\s+//; # remove leading blanks - if (AnnTalk::dup($field[1], $field[2], $field[3])) { - dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr'); - return; - } if ($censorpc) { my @bad; @@ -692,9 +693,8 @@ sub normal # input filter if required return unless $self->in_filter_route($parent); - my @rout = $parent->del_user($uref); - - $self->route_pc17($parent, @rout) if @rout; + $parent->del_user($uref); + $self->route_pc17($parent, $uref); return; } @@ -739,11 +739,18 @@ sub normal eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)"); # check for sane parameters - $ver = 5000 if $ver eq '0000'; +# $ver = 5000 if $ver eq '0000'; next if $ver < 5000; # only works with version 5 software next if length $call < 3; # min 3 letter callsigns next if $call eq $main::mycall; + # check that this PC19 isn't trying to alter the wrong dxchan + my $dxchan = DXChannel->get($call); + if ($dxchan && $dxchan != $self) { + dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); + return; + } + # update it if required my $r = Route::Node::get($call); my $flags = Route::here($here)|Route::conf($conf); @@ -825,20 +832,21 @@ sub normal $self->disconnect; return; } - my $node = Route::Node::get($call); if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! - my $dxchan = $node->dxchan; - if ($dxchan && $dxchan ne $self) { - dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); - return; - } - if ($call eq $self->{call}) { dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr'); return; } + my $node = Route::Node::get($call); if ($node) { + + my $dxchan = DXChannel->get($call); + if ($dxchan && $dxchan != $self) { + dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); + return; + } + # input filter it return unless $self->in_filter_route($node); @@ -956,6 +964,7 @@ sub normal } if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling + return if $pcno == 49 && eph_dup($line); if ($pcno == 49 || $field[1] eq $main::mycall) { DXMsg::process($self, $line); } else { @@ -1146,7 +1155,7 @@ sub normal return; } @field = map { unpad($_) } @field; - if (WCY::dup($d,@field[3..7])) { + if (WCY::dup($d)) { dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr'); return; } @@ -1155,7 +1164,7 @@ sub normal my $rep; eval { - $rep = Local::wwv($self, @field[1..12]); + $rep = Local::wcy($self, @field[1..12]); }; # dbg("Local::wcy error $@") if isdbg('local') if $@; return if $rep; @@ -1445,6 +1454,11 @@ sub send_announce } } + if (AnnTalk::dup($_[0], $_[1], $_[2])) { + dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr'); + return; + } + Log('ann', $target, $_[0], $text); # send it if it isn't the except list and isn't isolated and still has a hop count @@ -1768,7 +1782,7 @@ sub talk $line =~ s/\^/\\5E/g; # remove any ^ characters $self->send(DXProt::pc10($from, $to, $via, $line, $origin)); - Log('talk', $self->call, $from, $via?$via:$main::mycall, $line) unless $origin && $origin ne $main::mycall; + Log('talk', $to, $from, $via?$via:$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