projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Changed grepdbg to accept a regexp. More useful (to me anyway).
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 0d137e529bd3710f7dd391eadf9ee126f4fe0083..30b1b27899a773acd6c12930719acf8e6377d73c 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-421,7
+421,7
@@
sub normal
# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
my $mref = DXMsg::get_busy($call);
# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
my $mref = DXMsg::get_busy($call);
- $mref->stop_msg($
self
) if $mref;
+ $mref->stop_msg($
call
) if $mref;
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser->get_current($call);
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser->get_current($call);
@@
-437,8
+437,6
@@
sub normal
$user->put;
}
$user->put;
}
- # queue up any messages
- DXMsg::queue_msg(0) if $self->state eq 'normal';
return if $newline eq "PC19^";
# add hop count
return if $newline eq "PC19^";
# add hop count
@@
-451,10
+449,6
@@
sub normal
$self->send_local_config();
$self->send(pc22());
$self->state('normal');
$self->send_local_config();
$self->send(pc22());
$self->state('normal');
-
- # queue mail
- DXMsg::queue_msg(0);
-
return;
}
return;
}
@@
-483,12
+477,9
@@
sub normal
if ($pcno == 22) {
$self->state('normal');
if ($pcno == 22) {
$self->state('normal');
-
- # queue mail
- DXMsg::queue_msg(0);
return;
}
return;
}
-
+
if ($pcno == 23 || $pcno == 27) { # WWV info
# route 'foreign' pc27s
if ($pcno == 23 || $pcno == 27) { # WWV info
# route 'foreign' pc27s
@@
-573,7
+564,7
@@
sub normal
}
if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
}
if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
- if ($field[1] eq $main::mycall) {
+ if ($
pcno == 49 || $
field[1] eq $main::mycall) {
DXMsg::process($self, $line);
} else {
route($field[1], $line);
DXMsg::process($self, $line);
} else {
route($field[1], $line);
@@
-663,7
+654,7
@@
sub normal
if ($pcno == 43) {
last SWITCH;
}
if ($pcno == 43) {
last SWITCH;
}
- if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47
|| $pcno == 49
) {
+ if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) {
if ($field[1] eq $main::mycall) {
;
} else {
if ($field[1] eq $main::mycall) {
;
} else {
@@
-772,7
+763,7
@@
sub finish
# unbusy and stop and outgoing mail
my $mref = DXMsg::get_busy($call);
# unbusy and stop and outgoing mail
my $mref = DXMsg::get_busy($call);
- $mref->stop_msg($
self
) if $mref;
+ $mref->stop_msg($
call
) if $mref;
# broadcast to all other nodes that all the nodes connected to via me are gone
my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
# broadcast to all other nodes that all the nodes connected to via me are gone
my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();