projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added announce
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 9fb0b7113b3da06728e592f38a490af021caae47..7857daa2b76ec9300ba2454f6e2d46dece01990c 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-28,17
+28,16
@@
sub pc10
my ($self, $to, $via, $text) = @_;
my $user2 = $via ? $to : ' ';
my $user1 = $via ? $via : $to;
my ($self, $to, $via, $text) = @_;
my $user2 = $via ? $to : ' ';
my $user1 = $via ? $via : $to;
- my $
mycall = $self->call
;
+ my $
from = $self->call()
;
$text = unpad($text);
$text = ' ' if !$text;
$text = unpad($text);
$text = ' ' if !$text;
- return "PC10^$
mycall
^$user1^$text^*^$user2^$main::mycall^~";
+ return "PC10^$
from
^$user1^$text^*^$user2^$main::mycall^~";
}
}
-# create a dx message (call
ed $self->pc11(...)
+# create a dx message (call
, freq, dxcall, text)
sub pc11
{
sub pc11
{
- my ($self, $freq, $dxcall, $text) = @_;
- my $mycall = $self->call;
+ my ($mycall, $freq, $dxcall, $text) = @_;
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
@@
-50,7
+49,7
@@
sub pc12
{
my ($self, $text, $tonode, $sysop, $wx) = @_;
my $hops = get_hops(12);
{
my ($self, $text, $tonode, $sysop, $wx) = @_;
my $hops = get_hops(12);
- $sysop =
$sysop ? '*' : ' '
;
+ $sysop =
' ' if !$sysop
;
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
@@
-106,12
+105,14
@@
sub pc19
my @out;
while (@_) {
my @out;
while (@_) {
- my $str = "PC19
^$self->{call}
";
+ my $str = "PC19";
my $i;
for ($i = 0; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
my $ref = shift;
my $i;
for ($i = 0; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
my $ref = shift;
- $str .= "^$ref->{here}^$ref->{call}^$ref->{confmode}^$ref->{pcversion}";
+ my $here = $ref->{here} ? '1' : '0';
+ my $confmode = $ref->{confmode} ? '1' : '0';
+ $str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
}
$str .= sprintf "^%s^", get_hops(19);
push @out, $str;
}
$str .= sprintf "^%s^", get_hops(19);
push @out, $str;
@@
-141,6
+142,17
@@
sub pc22
return 'PC22^';
}
return 'PC22^';
}
+# here status
+sub pc24
+{
+ my $self = shift;
+ my $call = $self->call;
+ my $flag = $self->here ? '1' : '0';
+ my $hops = get_hops(24);
+
+ return "PC24^$call^$flag^$hops^";
+}
+
# send all the DX clusters I reckon are connected
sub pc38
{
# send all the DX clusters I reckon are connected
sub pc38
{
@@
-154,10
+166,21
@@
sub pc38
return "PC38^" . join(',', @nodes) . "^~";
}
return "PC38^" . join(',', @nodes) . "^~";
}
+# tell the local node to discconnect
+sub pc39
+{
+ my ($ref, $reason) = @_;
+ my $call = $ref->call;
+ my $hops = get_hops(21);
+ $reason = "Gone." if !$reason;
+ return "PC39^$call^$reason^";
+}
+
# periodic update of users, plus keep link alive device (always H99)
sub pc50
{
# periodic update of users, plus keep link alive device (always H99)
sub pc50
{
- my $n = DXNodeuser->count;
+ my $me = DXCluster->get($main::mycall);
+ my $n = $me->users ? $me->users : '0';
return "PC50^$main::mycall^$n^H99^";
}
return "PC50^$main::mycall^$n^H99^";
}