projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make the regexes for 19/21 take out 16/17 as well
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 72bce7c0ed45aef5394641a510e32bfbf337461e..0759db86587b1d13a6051af2d1becb5626d2ca77 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-669,7
+669,7
@@
sub normal
my $ver = $field[$i+3];
next unless defined $here && defined $conf && is_callsign($call);
my $ver = $field[$i+3];
next unless defined $here && defined $conf && is_callsign($call);
- eph_del_regex("^PC
21\^$call
");
+ eph_del_regex("^PC
(?:21\^$call|17\^[^\^]+\^$call)
");
# check for sane parameters
$ver = 5000 if $ver eq '0000';
# check for sane parameters
$ver = 5000 if $ver eq '0000';
@@
-747,7
+747,7
@@
sub normal
my $call = uc $field[1];
my $call = uc $field[1];
- eph_del_regex("^PC1
9
.*$call");
+ eph_del_regex("^PC1
[79]
.*$call");
my @rout;
my $parent = Route::Node::get($self->{call});
my @rout;
my $parent = Route::Node::get($self->{call});
@@
-904,6
+904,7
@@
sub normal
if ($pcno == 39) { # incoming disconnect
if ($field[1] eq $self->{call}) {
$self->disconnect(1);
if ($pcno == 39) { # incoming disconnect
if ($field[1] eq $self->{call}) {
$self->disconnect(1);
+ eph_dup_regex("^PC(?:1[679]|21).*$field[1]");
} else {
dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
}
} else {
dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
}