X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5f3890a02e0ee751e6ad2f3971facb376835e1a1;hb=3fe821fd8a168bc7175080838c4e3a4b30a86812;hp=460e401a0099b6a9b7f7cc711ffbf33e1116d4c8;hpb=d08aaa3e89259031f2d9b70a83ae194620870e7f;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 460e401a..5f3890a0 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -316,7 +316,8 @@ sub normal } else { $call = $to = $field[2]; } - $dxchan = DXChannel->get($call); + $dxchan = DXChannel->get($main::myalias) if $call eq $main::mycall; + $dxchan = DXChannel->get($call) unless $dxchan; if ($dxchan && $dxchan->is_user) { $field[3] =~ s/\%5E/^/g; $dxchan->talk($field[1], $to, $via, $field[3]); @@ -421,7 +422,7 @@ sub normal my $node; my $to = $user->homenode; my $last = $user->lastoper || 0; - if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) { + if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($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; @@ -554,6 +555,8 @@ sub normal for ($i = 2; $i < $#field; $i++) { 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; + $conf = $conf eq '*'; my $r = Route::User::get($call); @@ -633,6 +636,11 @@ sub normal # new routing list my @rout; my $parent = Route::Node::get($self->{call}); + unless ($parent) { + dbg("DXPROT: my parent $self->{call} has disappeared"); + $self->disconnect; + return; + } # parse the PC19 for ($i = 1; $i < $#field-1; $i += 4) { @@ -645,6 +653,7 @@ sub normal $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; # update it if required my $r = Route::Node::get($call); @@ -665,7 +674,10 @@ sub normal push @rout, $r unless $ar; } } else { - next if $call eq $main::mycall || $call eq $self->{call}; + if ($call eq $self->{call}) { + dbg("DXPROT: my channel route for $call has disappeared"); + next; + }; my $new = Route->new($call); # throw away if ($self->in_filter_route($new)) { @@ -710,7 +722,8 @@ sub normal my @rout; my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("PCPROT: Route::Node $call not in config") if isdbg('chanerr'); + dbg("DXPROT: my parent $self->{call} has disappeared"); + $self->disconnect; return; } my $node = Route::Node::get($call); @@ -1503,7 +1516,7 @@ sub route if ($dxchan) { my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name if ($routeit) { - $dxchan->send($routeit); + $dxchan->send($routeit) unless $dxchan == $me; } } else { dbg("PCPROT: No route available, dropped") if isdbg('chanerr'); @@ -1681,10 +1694,10 @@ sub addrcmd $r->{t} = $main::systime; $r->{cmd} = $cmd; $rcmds{$to} = $r; - + my $ref = Route::Node::get($to); my $dxchan = $ref->dxchan; - if ($dxchan && $dxchan->is_clx) { + if ($dxchan && $dxchan->is_clx) { route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd)); } else { route(undef, $to, pc34($main::mycall, $to, $cmd));