projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea55eb7
)
disconnect channels whose route node has disappeared
author
minima
<minima>
Fri, 6 Jul 2001 00:52:11 +0000
(
00:52
+0000)
committer
minima
<minima>
Fri, 6 Jul 2001 00:52:11 +0000
(
00:52
+0000)
Changes
patch
|
blob
|
history
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 254ec1ffbb15d90e698b29eb17245d9e55a3d3cd..6dcfcf238149ad0cd1bb4900ad666c42a23f8219 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,3
+1,5
@@
+05Jul01=======================================================================
+1. disconnect channels whose route node has disappeared
29Jun01=======================================================================
1. fix merge command
28Jun01=======================================================================
29Jun01=======================================================================
1. fix merge command
28Jun01=======================================================================
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 460e401a0099b6a9b7f7cc711ffbf33e1116d4c8..8364aca903e9f779ebd16054c5e2b9ff6b63a3fe 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-554,6
+554,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);
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);
$conf = $conf eq '*';
my $r = Route::User::get($call);
@@
-633,6
+635,11
@@
sub normal
# new routing list
my @rout;
my $parent = Route::Node::get($self->{call});
# 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) {
# parse the PC19
for ($i = 1; $i < $#field-1; $i += 4) {
@@
-645,6
+652,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
$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);
# update it if required
my $r = Route::Node::get($call);
@@
-665,7
+673,10
@@
sub normal
push @rout, $r unless $ar;
}
} else {
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)) {
my $new = Route->new($call); # throw away
if ($self->in_filter_route($new)) {
@@
-710,7
+721,8
@@
sub normal
my @rout;
my $parent = Route::Node::get($self->{call});
unless ($parent) {
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);
return;
}
my $node = Route::Node::get($call);