X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b5606eff609d9d61896f2b8558a1bb0444efef91;hb=520b5d73641f384e1ba59e4cb6b5ab84b54baf5a;hp=dc5dc0b99e5bc08198e96831a7853db07dea0807;hpb=07f2fed2f2949fb9e3f7f86c208150841bdeb30f;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index dc5dc0b9..b5606eff 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -35,7 +35,7 @@ use Script; use DXProtHandle; use Time::HiRes qw(gettimeofday tv_interval); -use Mojo::IOLoop::Subprocess; +use DXSubprocess; use strict; @@ -561,6 +561,7 @@ sub send_dx_spot foreach $dxchan (@dxchan) { next if $dxchan == $main::me; next if $dxchan == $self && $self->is_node; + next if $dxchan->is_rbn; if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) { unless ($pc11) { my @f = split /\^/, $line; @@ -621,6 +622,7 @@ sub send_wwv_spot foreach $dxchan (@dxchan) { next if $dxchan == $main::me; next if $dxchan == $self && $self->is_node; + next if $dxchan->is_rbn; my $routeit; my ($filter, $hops); @@ -655,6 +657,7 @@ sub send_wcy_spot foreach $dxchan (@dxchan) { next if $dxchan == $main::me; next if $dxchan == $self; + next if $dxchan->is_rbn; $dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, @dxcc); } @@ -738,6 +741,7 @@ sub send_announce next if $dxchan == $self && $self->is_node; next if $from_pc9x && $dxchan->{do_pc9x}; next if $target eq 'LOCAL' && $dxchan->is_node; + next if $dxchan->is_rbn; $dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, @a[0..2], @b[0..2]); } @@ -810,6 +814,7 @@ sub send_chat next unless $dxchan->is_spider && $dxchan->do_pc9x; next if $target eq 'LOCAL'; } + next if $dxchan->is_rbn; $dxchan->chat($line, $self->{isolate}, $target, $_[1], $text, @_, $self->{call}, @a[0..2], @b[0..2]); @@ -1216,7 +1221,7 @@ sub spawn_cmd no strict 'refs'; - my $fc = Mojo::IOLoop::Subprocess->new; + my $fc = DXSubprocess->new; # just behave normally if something has set the "one-shot" _nospawn in the channel if ($self->{_nospawn}) {