projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix !( spurious && before next item in Filter
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 4510714684ebd7b83db6aa862b08e587a3d13309..b5606eff609d9d61896f2b8558a1bb0444efef91 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-35,7
+35,7
@@
use Script;
use DXProtHandle;
use Time::HiRes qw(gettimeofday tv_interval);
use DXProtHandle;
use Time::HiRes qw(gettimeofday tv_interval);
-use
Mojo::IOLoop::
Subprocess;
+use
DX
Subprocess;
use strict;
use strict;
@@
-254,6
+254,7
@@
sub init
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
$main::me->{do_pc9x} = 1;
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
$main::me->{do_pc9x} = 1;
+ $main::me->{hostname} = $main::clusteraddr;
$main::me->update_pc92_next($pc92_short_update_period);
$main::me->update_pc92_keepalive;
}
$main::me->update_pc92_next($pc92_short_update_period);
$main::me->update_pc92_keepalive;
}
@@
-560,6
+561,7
@@
sub send_dx_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
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;
if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
unless ($pc11) {
my @f = split /\^/, $line;
@@
-620,6
+622,7
@@
sub send_wwv_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
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);
my $routeit;
my ($filter, $hops);
@@
-654,6
+657,7
@@
sub send_wcy_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self;
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);
}
$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, @dxcc);
}
@@
-737,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 == $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]);
}
$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
@a[0..2], @b[0..2]);
}
@@
-809,6
+814,7
@@
sub send_chat
next unless $dxchan->is_spider && $dxchan->do_pc9x;
next if $target eq 'LOCAL';
}
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]);
$dxchan->chat($line, $self->{isolate}, $target, $_[1],
$text, @_, $self->{call}, @a[0..2], @b[0..2]);
@@
-865,11
+871,11
@@
sub send_local_config
my @remotenodes;
if ($self->{isolate}) {
my @remotenodes;
if ($self->{isolate}) {
- dbg("send_local_config: isolated");
+ dbg("
$self->{call}
send_local_config: isolated");
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
- dbg("send_local_config: doing pc9x");
+ dbg("
$self->{call}
send_local_config: doing pc9x");
my $node = Route::Node::get($self->{call});
# $self->send_last_pc92_config($main::routeroot);
# $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
my $node = Route::Node::get($self->{call});
# $self->send_last_pc92_config($main::routeroot);
# $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
@@
-880,7
+886,7
@@
sub send_local_config
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
- dbg("send_local_config: traditional");
+ dbg("
$self->{call}
send_local_config: traditional");
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@@
-1126,7
+1132,7
@@
sub process_rcmd
$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
return;
}
$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
return;
}
- Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
+ Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd
, $user
);
my $cref = Route::Node::get($fromnode);
unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)");
my $cref = Route::Node::get($fromnode);
unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)");
@@
-1174,7
+1180,7
@@
sub send_rcmd_reply
while (@_) {
my $line = shift;
$line =~ s/\s*$//;
while (@_) {
my $line = shift;
$line =~ s/\s*$//;
- Log('rcmd', 'out', $fromnode, $line);
+ Log('rcmd', 'out', $fromnode, $line
, $user
);
if ($self->is_clx) {
$self->send(pc85($main::mycall, $fromnode, $user, "$main::mycall:$line"));
} else {
if ($self->is_clx) {
$self->send(pc85($main::mycall, $fromnode, $user, "$main::mycall:$line"));
} else {
@@
-1215,23
+1221,34
@@
sub spawn_cmd
no strict 'refs';
no strict 'refs';
- my $fc =
Mojo::IOLoop::
Subprocess->new;
+ my $fc =
DX
Subprocess->new;
# just behave normally if something has set the "one-shot" _nospawn in the channel
# just behave normally if something has set the "one-shot" _nospawn in the channel
- return ($cmdref->(@$args)) if $self->{_nospawn};
+ if ($self->{_nospawn}) {
+ eval { @out = $cmdref->(@$args); };
+ if ($@) {
+ DXDebug::dbgprintring(25);
+ push @out, DXDebug::shortmess($@);
+ }
+ return @out;
+ }
# $fc->serializer(\&encode_json);
# $fc->deserializer(\&decode_json);
$fc->run(
sub {
my $subpro = shift;
# $fc->serializer(\&encode_json);
# $fc->deserializer(\&decode_json);
$fc->run(
sub {
my $subpro = shift;
- if (isdbg('chan')) {
- my $s = "line: $line";
- $s .= ", args: " . join(', ', @$args) if $args && @$args;
+ if (isdbg('progress')) {
+ my $s = qq{line: "$line"};
+ $s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
+ dbg($s);
}
}
-
- my @res = $cmdref->(@$args);
- return @res;
+ eval { @out = $cmdref->(@$args); };
+ if ($@) {
+ DXDebug::dbgprintring(25);
+ push @out, DXDebug::shortmess($@);
+ }
+ return @out;
},
# $args,
sub {
},
# $args,
sub {
@@
-1260,7
+1277,7
@@
sub spawn_cmd
$self->send(@res);
}
}
$self->send(@res);
}
}
-
DXCommandmode::_diffms($call, $line, $t0
);
+
diffms("rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('progress'
);
});
return @out;
});
return @out;