From: Dirk Koopman Date: Wed, 25 Jul 2007 13:06:07 +0000 (+0100) Subject: restore talk " not visible on cluster" message X-Git-Tag: 1.55~86 X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=6fb4862ab94c57166f0f09c0a5f1a28cb35b5189;p=spider.git restore talk " not visible on cluster" message Restore the message if the is not routable. However, instead of the old behaviour of then just stopping dead, it now sends the message anyway as a broadcast. --- diff --git a/cmd/talk.pl b/cmd/talk.pl index 2d1fbb9e..57b27e7c 100644 --- a/cmd/talk.pl +++ b/cmd/talk.pl @@ -40,7 +40,7 @@ $via = uc $via if $via; my $call = $via || $to; my $clref = Route::get($call); # try an exact call my $dxchan = $clref->dxchan if $clref; -#return (1, $self->msg('e7', $call)) unless $dxchan; +push @out, $self->msg('e7', $call) unless $dxchan; #$DB::single = 1; diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 831d8885..10a5fe72 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -1770,24 +1770,21 @@ sub handle_93 } # convert to PC10 talks where appropriate - 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 '*' || $to eq 'SYSOP' || $to eq 'WX') { # announces my $sysop = $to eq 'SYSOP' ? '*' : ' '; diff --git a/perl/Version.pm b/perl/Version.pm index ecefc7ca..b2d7b72d 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.54'; $subversion = '0'; -$build = '128'; +$build = '129'; 1;