X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0b788ba73c10d0ed68818b09c7c3b1d2ae6290ed;hb=ebbf88f53284e6b7e77c3319047607b1c5cd2518;hp=51bdc8efa34712dcdc6b05743f193dbfe516c178;hpb=9a31104f31ce5d80a659dea3de9dbf9a5d46ef8e;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 51bdc8ef..0b788ba7 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -444,7 +444,7 @@ sub handle_10 if ($ref = Route::get($to)) { $vref = Route::Node::get($via) if $via; $vref = undef unless $vref && grep $to eq $_, $vref->users; - $ref->dxchan->talk($from, $to, $vref ? $via : undef, $_[3], $_[6]); + $ref->bestdxchan->talk($from, $to, $vref ? $via : undef, $_[3], $_[6]); return; } @@ -453,7 +453,7 @@ sub handle_10 $ref = Route::get($from); $vref = $ref = Route::Node::get($_[6]) unless $ref; if ($ref) { - $dxchan = $ref->dxchan; + $dxchan = $ref->bestdxchan; $dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) ); } } @@ -572,7 +572,7 @@ sub handle_11 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; + my $dxchan = $node->bestdxchan; if ($dxchan && $dxchan->is_clx) { route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd)); } else { @@ -582,7 +582,7 @@ sub handle_11 $to = $_[7]; $node = Route::Node::get($to); if ($node) { - $dxchan = $node->dxchan; + $dxchan = $node->bestdxchan; if ($dxchan && $dxchan->is_clx) { route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd)); } else { @@ -666,7 +666,7 @@ sub handle_12 if ($call) { my $ref = Route::get($call); if ($ref) { - $dxchan = $ref->dxchan; + $dxchan = $ref->bestdxchan; $dxchan->talk($_[1], $call, undef, $_[3], $_[5]) if $dxchan != $self; return; } @@ -707,7 +707,10 @@ sub handle_16 } # do we believe this call? - next unless $ncall eq $self->{call} || $self->is_believed($ncall); + unless ($ncall eq $self->{call} || $self->is_believed($ncall)) { + dbg("PCPROT: We don't believe $ncall on $self->{call}"); + return; + } my $node = Route::Node::get($ncall); unless ($node) { @@ -740,8 +743,8 @@ sub handle_16 dbg("PCPROT: $call is a node") if isdbg('chanerr'); next; } - - $r = Route::User::get($call) || Route::User::get($call); + + $r = Route::User::get($call) || Route::User->new($call); $r->here($here); $r->conf($conf); $node->lastseen($main::systime); @@ -784,7 +787,10 @@ sub handle_17 } # do we believe this call? - next unless $ncall eq $self->{call} || $self->is_believed($ncall); + unless ($ncall eq $self->{call} || $self->is_believed($ncall)) { + dbg("PCPROT: We don't believe $ncall on $self->{call}"); + return; + } my $uref = Route::User::get($ucall); unless ($uref) { @@ -842,9 +848,20 @@ sub handle_18 $self->newroute( $_[1] =~ /NewRoute/ ); # first clear out any nodes on this dxchannel - my $parent = Route::Node::get($self->{call}); - my @rout = $parent->del_nodes; - $self->route_pc21($origin, $line, @rout, $parent) if @rout; + my $node = Route::Node::get($self->{call}) ; + my @rout; + foreach my $n ($node->nodes) { + next if $n eq $main::mycall; + next if $n eq $self->{call}; + my $nref = Route::Node::get($n); + push @rout, $node->remove_route($nref, $self) if $nref; + } + $self->route_pc21($origin, $line, @rout) if @rout; + for (@rout) { + $_->delete; + }; + + # send the new config $self->send_local_config(); $self->send(pc20()); } @@ -893,7 +910,10 @@ sub handle_19 next if $call eq $main::mycall; # do we believe this call? - next unless $call eq $self->{call} || $self->is_believed($call); + unless ($call eq $self->{call} || $self->is_believed($call)) { + dbg("PCPROT: We don't believe $call on $self->{call}"); + next; + } eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)"); @@ -957,6 +977,11 @@ sub handle_21 return if $call eq $main::mycall; # don't allow malicious buggers to disconnect me (or ignore loops)! + unless ($call eq $self->{call} || $self->is_believed($call)) { + dbg("PCPROT: We don't believe $call on $self->{call}"); + return; + } + eph_del_regex("^PC1[679].*$call"); # if I get a PC21 from the same callsign as self then treat it @@ -1418,7 +1443,7 @@ sub handle_59 return unless $self->in_filter_route($fnode); # now do it properly for actions - my $node = Route::Node::get($ncall) || Route::Node::new($ncall); + my $node = Route::Node::get($ncall) || Route::Node->new($ncall); $node->newroute(1); # find each of the entries (or create new ones) @@ -1449,7 +1474,7 @@ sub handle_59 $user->node($ncall); $user->put; } - $ref = Route::User::new($ecall, 0); + $ref = Route::User->new($ecall, 0); } } elsif ($esort eq 'N') { $ref = Route::Node::get($ecall); @@ -1465,7 +1490,7 @@ sub handle_59 $user->node($ncall); $user->put; } - $ref = Route::Node::new($ecall, 0); + $ref = Route::Node->new($ecall, 0); } } else { dbg("DXPROT: unknown entity type '$esort' on $ecall for node $ncall") if isdbg('chan'); @@ -2034,7 +2059,7 @@ sub route my $dxchan = DXChannel->get($call); unless ($dxchan) { my $cl = Route::get($call); - $dxchan = $cl->dxchan if $cl; + $dxchan = $cl->bestdxchan if $cl; if (ref $dxchan) { if (ref $self && $dxchan eq $self) { dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr'); @@ -2210,7 +2235,7 @@ sub addrcmd $rcmds{$to} = $r; my $ref = Route::Node::get($to); - my $dxchan = $ref->dxchan; + my $dxchan = $ref->bestdxchan; if ($dxchan && $dxchan->is_clx) { route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd)); } else { @@ -2236,16 +2261,12 @@ sub disconnect # do routing stuff, remove me from routing table my $node = Route::Node::get($call); my @rout; - my @rusers; if ($node) { # remove the route from this node and return a list # of nodes that have become orphanned as a result. push @rout, $main::routeroot->remove_route($node, $self); - # remove all consequently orphanned users from these nodes - push @rusers, $_->unlink_all_users for @rout; - # remove all my ephemera as well for (@rout) { my $c = $_->call; @@ -2264,7 +2285,7 @@ sub disconnect } # delete all the unwanted nodes - $_->delete for @rout, @rusers; + $_->delete for @rout; # remove outstanding pings delete $pings{$call};