X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4b96fe9608fad9b2eeebbf143c27e302cb654b82;hb=2a43619b670b8f9249558f814b0183262c3ba4f6;hp=e41951da26b4f932be9b8103bb52e75e21adcfcd;hpb=78cf2dcb9be8128af7f8dc5ae37540c9c53c6057;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index e41951da..4b96fe96 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -213,7 +213,9 @@ sub start # remember type of connection $self->{consort} = $line; $self->{outbound} = $sort eq 'O'; - $self->{priv} = $user->priv || 1; # other clusters can always be 'normal' users + my $priv = $user->priv; + $priv = $user->priv(1) unless $priv; + $self->{priv} = $priv; # other clusters can always be 'normal' users $self->{lang} = $user->lang || 'en'; $self->{isolate} = $user->{isolate}; $self->{consort} = $line; # save the connection type @@ -422,7 +424,7 @@ sub normal my $node; my $to = $user->homenode; my $last = $user->lastoper || 0; - if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) { + if ($send_opernam && $to && $to ne $main::mycall && $main::systime > $last + $DXUser::lastoperinterval && ($node = Route::Node::get($to)) ) { my $cmd = "forward/opernam $spot[4]"; # send the rcmd but we aren't interested in the replies... my $dxchan = $node->dxchan; @@ -556,6 +558,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 +586,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 +602,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 +624,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 +666,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 @@ -698,7 +718,7 @@ sub normal $user = DXUser->new($call); $user->sort('A'); $user->priv(1); # I have relented and defaulted nodes - $self->{priv} = 1; # to user RCMDs allowed + $user->lockout(1); $user->homenode($call); $user->node($call); } @@ -706,6 +726,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 +744,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 +772,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 +908,7 @@ sub normal if ($pcno == 39) { # incoming disconnect if ($field[1] eq $self->{call}) { $self->disconnect(1); + eph_del_regex("^PC(?:1[679]|21).*$field[1]"); } else { dbg("PCPROT: came in on wrong channel") if isdbg('chanerr'); } @@ -887,6 +922,11 @@ sub normal # my $ref = Route::get($call) || Route->new($call); # return unless $self->in_filter_route($ref); + if ($field[3] eq $field[2]) { + dbg('PCPROT: invalid value') if isdbg('chanerr'); + return; + } + # add this station to the user database, if required my $user = DXUser->get_current($call); $user = DXUser->new($call) if !$user; @@ -954,6 +994,7 @@ sub normal my $to = $field[1]; my $from = $field[2]; my $flag = $field[3]; + # is it for us? if ($to eq $main::mycall) { @@ -989,6 +1030,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); } @@ -1145,7 +1190,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 @@ -1161,7 +1206,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; } @@ -1605,10 +1650,7 @@ sub process_rcmd_reply my $s = $rcmds{$fromnode}; if ($s) { my $dxchan = DXChannel->get($s->{call}); - my $ref = DXChannel->get($user) || $dxchan; - if ($ref->{call} eq $main::mycall) { - $ref = DXChannel->get($main::myalias) || $ref; - } + my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan); $ref->send($line) if $ref; delete $rcmds{$fromnode} if !$dxchan; } else { @@ -1678,7 +1720,7 @@ sub disconnect my $node = Route::Node::get($call); my @rout; if ($node) { - @rout = $node->del_nodes; # at the next level +# @rout = $node->del_nodes; # at the next level @rout = $node->del($main::routeroot); } @@ -1757,7 +1799,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); } } } @@ -1773,10 +1815,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}; } } } @@ -1847,6 +1889,17 @@ sub eph_dup 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);