X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=9e0f5ec4adb111ccf81f159a6368049cce558926;hb=fee8c4eabda49d4c7440ce1075ea49dcd9c2e825;hp=cd229c0f2d113370a11869e7d06de450efc76edb;hpb=e228aafbb2f9eee36802d209f5d3bb3eef8e91fc;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index cd229c0f..9e0f5ec4 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -1433,7 +1433,7 @@ sub check_pc9x_t # the id on it is completely unreliable. Besides, only commands # originating on this box will go through this code... if ($parent->call ne $main::mycall) { - my $lastid = $parent->lastid->{$pc} || 0; + my $lastid = $parent->lastid || 0; if ($t < $lastid) { if ($t+86400-$lastid > $pc9x_past_age) { dbg("PCPROT: dup id on $t <= $lastid, ignored") if isdbg('chanerr'); @@ -1453,7 +1453,7 @@ sub check_pc9x_t } elsif ($create) { $parent = Route::Node->new($call); } - $parent->lastid->{$pc} = $t if $parent; + $parent->lastid($t) if $parent; return $parent; } @@ -1711,7 +1711,8 @@ sub handle_93 return; } - # remember that we are converting PC10->PC93 + # remember that we are converting PC10->PC93 and self will be $main::me if it + # comes from us unless ($self->{do_pc9x}) { dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr'); return; @@ -1720,11 +1721,11 @@ sub handle_93 my $t = $_[2]; my $parent = check_pc9x_t($pcall, $t, 93, 1) || return; - my $to = $_[3]; - my $from = $_[4]; - my $via = $_[5]; + my $to = uc $_[3]; + my $from = uc $_[4]; + my $via = uc $_[5]; my $text = $_[6]; - my $onode = $_[7]; + my $onode = uc $_[7]; $onode = $pcall if @_ <= 8; # this is catch loops caused by bad software ... @@ -1749,7 +1750,9 @@ sub handle_93 return; } - if (is_callsign($to)) { + # if it is routeable then then treat it like a talk + my $ref = Route::get($to); + if ($ref) { # local talks my $dxchan; $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall; @@ -1767,34 +1770,30 @@ sub handle_93 } # convert to PC10 talks where appropriate - my $ref = Route::get($to); - if ($ref) { - # just go for the "best" one for now (rather than broadcast) - $dxchan = $ref->dxchan; + # just go for the "best" one for now (rather than broadcast) + $dxchan = $ref->dxchan; - # check it... - if (ref $dxchan && $dxchan->isa('DXChannel')) { - if ($dxchan->{do_pc9x}) { - $dxchan->send($line); - } else { - $dxchan->talk($from, $to, $via, $text, $onode); - } + # check it... + if (ref $dxchan && $dxchan->isa('DXChannel')) { + if ($dxchan->{do_pc9x}) { + $dxchan->send($line); } else { - dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)"); + $dxchan->talk($from, $to, $via, $text, $onode); } - return; + } else { + dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)"); } + return; - # otherwise, drop through and allow it to be broadcast - } elsif ($to eq '*' || uc $to eq 'SYSOP' || uc $to eq 'WX') { + } elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') { # announces - my $sysop = uc $to eq 'SYSOP' ? '*' : ' '; - my $wx = uc $to eq 'WX' ? '1' : '0'; + my $sysop = $to eq 'SYSOP' ? '*' : ' '; + my $wx = $to eq 'WX' ? '1' : '0'; my $local = $via eq 'LOCAL' ? '*' : $via; $self->send_announce(1, pc12($from, $text, $local, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef); return if $via eq 'LOCAL'; - } else { + } elsif (!is_callsign($to) && $text =~ /^#\d+ /) { # chat messages to non-pc9x nodes $self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0'); }