X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=9e1f7c6f880fbc54a16d4561b342ef0092101a48;hb=86316dcf45d7cbdcd8e3f512be655242ab1701ff;hp=0f8aaebf78e65027d1ef634cf84ae9ad21116d5a;hpb=618c97014cb5398a847da35ad2d41c7ee0b0a2ae;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 0f8aaebf..9e1f7c6f 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -406,7 +406,7 @@ sub normal my $user = DXUser->get_current($spot[4]); if ($user) { my $qra = $user->qra; - unless ($qra && DXBearing::is_qra($qra)) { + unless ($qra && is_qra($qra)) { my $lat = $user->lat; my $long = $user->long; if (defined $lat && defined $long) { @@ -556,6 +556,8 @@ sub normal my ($call, $conf, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o; next unless $call && $conf && defined $here && is_callsign($call); next if $call eq $main::mycall; + + eph_del_regex("^PC17\^$call\^$ncall"); $conf = $conf eq '*'; @@ -582,6 +584,10 @@ sub normal $user->put; } + if (eph_dup($line)) { + dbg("PCPROT: dup PC16 detected") if isdbg('chanerr'); + return; + } # queue up any messages (look for privates only) DXMsg::queue_msg(1) if $self->state eq 'normal'; @@ -594,6 +600,9 @@ sub normal my $dxchan; my $ncall = $field[2]; my $ucall = $field[1]; + + eph_del_regex("^PC16.*$ncall.*$ucall"); + if ($ncall eq $main::mycall) { dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr'); return; @@ -613,6 +622,12 @@ sub normal return unless $self->in_filter_route($parent); my @rout = $parent->del_user($ucall); + + if (eph_dup($line)) { + dbg("PCPROT: dup PC17 detected") if isdbg('chanerr'); + return; + } + $self->route_pc17($parent, @rout) if @rout; return; } @@ -649,6 +664,9 @@ sub normal my $conf = $field[$i+2]; my $ver = $field[$i+3]; next unless defined $here && defined $conf && is_callsign($call); + + eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)"); + # check for sane parameters $ver = 5000 if $ver eq '0000'; next if $ver < 5000; # only works with version 5 software @@ -706,6 +724,11 @@ sub normal $user->put; } + if (eph_dup($line)) { + dbg("PCPROT: dup PC19 detected") if isdbg('chanerr'); + return; + } + $self->route_pc19(@rout) if @rout; return; } @@ -719,6 +742,9 @@ sub normal if ($pcno == 21) { # delete a cluster from the list my $call = uc $field[1]; + + eph_del_regex("^PC1[79].*$call"); + my @rout; my $parent = Route::Node::get($self->{call}); unless ($parent) { @@ -744,6 +770,12 @@ sub normal dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr'); return; } + + if (eph_dup($line)) { + dbg("PCPROT: dup PC21 detected") if isdbg('chanerr'); + return; + } + $self->route_pc21(@rout) if @rout; return; } @@ -874,6 +906,7 @@ sub normal if ($pcno == 39) { # incoming disconnect if ($field[1] eq $self->{call}) { $self->disconnect(1); + eph_dup_regex("^PC(?:1[679]|21).*$field[1]"); } else { dbg("PCPROT: came in on wrong channel") if isdbg('chanerr'); } @@ -884,14 +917,8 @@ sub normal my $call = $field[1]; # input filter if required - my $ref = Route::get($call) || Route->new($call); - return unless $self->in_filter_route($ref); - - # dup check it - if (eph_dup($line)) { - dbg("PCPROT: ephemeral PC41 dup dropped") if isdbg('chanerr'); - return; - } +# my $ref = Route::get($call) || Route->new($call); +# return unless $self->in_filter_route($ref); # add this station to the user database, if required my $user = DXUser->get_current($call); @@ -902,12 +929,27 @@ sub normal } elsif ($field[2] == 2) { $user->qth($field[3]); } elsif ($field[2] == 3) { - my ($lat, $long) = DXBearing::stoll($field[3]); - $user->lat($lat); - $user->long($long); - $user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra && DXBearing::is_qra($user->qra); + if (is_latlong($field[3])) { + my ($lat, $long) = DXBearing::stoll($field[3]); + $user->lat($lat); + $user->long($long); + $user->qra(DXBearing::lltoqra($lat, $long)); + } else { + dbg('PCPROT: not a valid lat/long') if isdbg('chanerr'); + return; + } } elsif ($field[2] == 4) { $user->homenode($field[3]); + } elsif ($field[2] == 5) { + if (is_qra($field[3])) { + my ($lat, $long) = DXBearing::qratoll($field[3]); + $user->lat($lat); + $user->long($long); + $user->qra($field[3]); + } else { + dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr'); + return; + } } $user->lastoper($main::systime); # to cut down on excessive for/opers being generated $user->put; @@ -945,6 +987,7 @@ sub normal my $to = $field[1]; my $from = $field[2]; my $flag = $field[3]; + # is it for us? if ($to eq $main::mycall) { @@ -980,6 +1023,10 @@ sub normal } } } else { + if (eph_dup($line)) { + dbg("PCPROT: dup PC51 detected") if isdbg('chanerr'); + return; + } # route down an appropriate thingy $self->route($to, $line); } @@ -1136,7 +1183,7 @@ sub dx_spot ($filter, $hops) = $self->{spotsfilter}->it(@_); return unless $filter; } - send_prot_line($self, $filter, $hops, $isolate, $line) + send_prot_line($self, $filter, $hops, $isolate, $line); } sub send_prot_line @@ -1152,7 +1199,7 @@ sub send_prot_line return unless $routeit; } if ($filter) { - $self->send($routeit) if $routeit; + $self->send($routeit); } else { $self->send($routeit) unless $self->{isolate} || $isolate; } @@ -1596,7 +1643,7 @@ sub process_rcmd_reply my $s = $rcmds{$fromnode}; if ($s) { my $dxchan = DXChannel->get($s->{call}); - my $ref = DXChannel->get($user) || $dxchan; + my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan); $ref->send($line) if $ref; delete $rcmds{$fromnode} if !$dxchan; } else { @@ -1745,7 +1792,7 @@ sub send_route $routeit = adjust_hops($self, $line); # adjust its hop count by node name next unless $routeit; } - $self->send($routeit) if $self->{routefilter} || !$self->{isolate}; + $self->send($routeit); } } } @@ -1761,10 +1808,10 @@ sub broadcast_route foreach $dxchan (@dxchan) { next if $dxchan == $self; next if $dxchan == $me; - if ($dxchan->{routefilter} || !$self->{isolate}) { - $dxchan->send_route($generate, @_) + if ($dxchan->{routefilter}) { + $dxchan->send_route($generate, @_); } else { - dbg('DXPROT: isolated') if isdbg('chanerr'); + $dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate}; } } } @@ -1829,12 +1876,23 @@ sub eph_dup my $s = shift; # chop the end off - $s =~ s/\^H\d\d?\^?~?$//; + $s =~ s/\^H\d\d?\^?\~?$//; return 1 if exists $eph{$s}; $eph{$s} = $main::systime; return undef; } +sub eph_del_regex +{ + my $regex = shift; + my ($key, $val); + while (($key, $val) = each %eph) { + if ($key =~ m{$regex}) { + delete $eph{$key}; + } + } +} + sub eph_clean { my ($key, $val);