projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop nagling on node output
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 3d3a46bc1c01a46bb1ae3561dafd3d2cc242c888..a2b69a67a9f4dfbba796dfaa5c17e7dde67aa184 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-19,6
+19,12
@@
use DXDebug;
use strict;
use strict;
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
#
# All the PCxx generation routines
#
#
# All the PCxx generation routines
#
@@
-26,12
+32,20
@@
use strict;
# create a talk string ($from, $to, $via, $text)
sub pc10
{
# create a talk string ($from, $to, $via, $text)
sub pc10
{
- my ($from, $to, $via, $text) = @_;
- my $user2 = $via ? $to : ' ';
- my $user1 = $via ? $via : $to;
+ my ($from, $to, $via, $text, $origin) = @_;
+ my ($user1, $user2);
+ if ($via && $via ne $to) {
+ $user1 = $via;
+ $user2 = $to;
+ } else {
+ $user2 = ' ';
+ $user1 = $to;
+ }
+ $origin ||= $main::mycall;
$text = unpad($text);
$text = unpad($text);
- $text = ' ' if !$text;
- return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";
+ $text = ' ' unless $text && length $text > 0;
+ $text =~ s/\^/%5E/g;
+ return "PC10^$from^$user1^$text^*^$user2^$origin^~";
}
# create a dx message (call, freq, dxcall, text)
}
# create a dx message (call, freq, dxcall, text)
@@
-41,6
+55,7
@@
sub pc11
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
+ $text =~ s/\^/%5E/g;
return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
}
return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
}
@@
-53,48
+68,54
@@
sub pc12
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
+ $text =~ s/\^/%5E/g;
return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
}
#
# add one or more users (I am expecting references that have 'call',
return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
}
#
# add one or more users (I am expecting references that have 'call',
-# 'conf
mode
' & 'here' method)
+# 'conf' & 'here' method)
#
# this will create a list of PC16 with up pc16_max_users in each
# called $self->pc16(..)
#
sub pc16
{
#
# this will create a list of PC16 with up pc16_max_users in each
# called $self->pc16(..)
#
sub pc16
{
- my $self = shift;
+ my $node = shift;
+ my $ncall = $node->call;
my @out;
my @out;
- foreach (@_) {
- my $str = "PC16^$self->{call}";
- my $i;
-
- for ($i = 0; @_ > 0 && $i < $DXProt::pc16_max_users; $i++) {
+ while (@_) {
+ my $str = "PC16^$ncall";
+ for ( ; @_ && length $str < 200; ) {
my $ref = shift;
my $ref = shift;
- $str .= sprintf "^%s %s %d", $ref->call, $ref->conf
mode
? '*' : '-', $ref->here;
+ $str .= sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
}
$str .= sprintf "^%s^", get_hops(16);
push @out, $str;
}
}
$str .= sprintf "^%s^", get_hops(16);
push @out, $str;
}
- return
(@out)
;
+ return
@out
;
}
# remove a local user
sub pc17
{
}
# remove a local user
sub pc17
{
- my ($self, $ref) = @_;
- my $hops = get_hops(17);
- return "PC17^$ref->{call}^$self->{call}^$hops^";
+ my @out;
+ while (@_) {
+ my $node = shift;
+ my $ref = shift;
+ my $hops = get_hops(17);
+ my $ncall = $node->call;
+ my $ucall = $ref->call;
+ push @out, "PC17^$ucall^$ncall^$hops^";
+ }
+ return @out;
}
# Request init string
sub pc18
{
}
# Request init string
sub pc18
{
- my $info = DXCluster::cluster;
- return "PC18^$info^$DXProt::myprot_version^";
+ return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
}
#
}
#
@@
-102,18
+123,17
@@
sub pc18
#
sub pc19
{
#
sub pc19
{
- my $self = shift;
my @out;
my @out;
- while
(@_) {
+ while(@_) {
my $str = "PC19";
my $str = "PC19";
- my $i;
-
- for ($i = 0; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
+ for (; @_ && length $str < 200;) {
my $ref = shift;
my $ref = shift;
- my $here = $ref->{here} ? '1' : '0';
- my $confmode = $ref->{confmode} ? '1' : '0';
- $str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
+ my $call = $ref->call;
+ my $here = $ref->here;
+ my $conf = $ref->conf;
+ my $version = $ref->version;
+ $str .= "^$here^$call^$conf^$version";
}
$str .= sprintf "^%s^", get_hops(19);
push @out, $str;
}
$str .= sprintf "^%s^", get_hops(19);
push @out, $str;
@@
-130,10
+150,14
@@
sub pc20
# delete a node
sub pc21
{
# delete a node
sub pc21
{
- my ($call, $reason) = @_;
- my $hops = get_hops(21);
- $reason = "Gone." if !$reason;
- return "PC21^$call^$reason^$hops^";
+ my @out;
+ while (@_) {
+ my $node = shift;
+ my $hops = get_hops(21);
+ my $call = $node->call;
+ push @out, "PC21^$call^Gone^$hops^";
+ }
+ return @out;
}
# end of init phase
}
# end of init phase
@@
-148,7
+172,7
@@
sub pc24
my $self = shift;
my $call = $self->call;
my $flag = $self->here ? '1' : '0';
my $self = shift;
my $call = $self->call;
my $flag = $self->here ? '1' : '0';
- my $hops = get_hops(24);
+ my $hops =
shift ||
get_hops(24);
return "PC24^$call^$flag^$hops^";
}
return "PC24^$call^$flag^$hops^";
}
@@
-178,6
+202,7
@@
sub pc28
my $time = ztime($t);
$private = $private ? '1' : '0';
$rr = $rr ? '1' : '0';
my $time = ztime($t);
$private = $private ? '1' : '0';
$rr = $rr ? '1' : '0';
+ $subject ||= ' ';
return "PC28^$tonode^$fromnode^$to^$from^$date^$time^$private^$subject^ ^5^$rr^ ^$origin^~";
}
return "PC28^$tonode^$fromnode^$to^$from^$date^$time^$private^$subject^ ^5^$rr^ ^$origin^~";
}
@@
-185,8
+210,8
@@
sub pc28
sub pc29
{
my ($fromnode, $tonode, $stream, $text) = @_;
sub pc29
{
my ($fromnode, $tonode, $stream, $text) = @_;
- $text =
~ s/\^/:/og; # remove ^
-# $text =~ s/\~/S/og;
+ $text =
' ' unless $text && length $text > 0;
+ $text =~ s/\^/%5E/og; # remove ^
return "PC29^$fromnode^$tonode^$stream^$text^~";
}
return "PC29^$fromnode^$tonode^$stream^$text^~";
}
@@
-235,8
+260,7
@@
sub pc35
# send all the DX clusters I reckon are connected
sub pc38
{
# send all the DX clusters I reckon are connected
sub pc38
{
- my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
- return "PC38^" . join(',', @nodes) . "^~";
+ return join '^', "PC38", map {$_->call} Route::Node::get_all();
}
# tell the local node to discconnect
}
# tell the local node to discconnect
@@
-259,9
+283,12
@@
sub pc40
# user info
sub pc41
{
# user info
sub pc41
{
- my ($call, $sort, $info) = @_;
- my $hops = get_hops(41);
- $sort = $sort ? "$sort" : '0';
+ my $call = shift;
+ $call = shift if ref $call;
+
+ my $sort = shift || '0';
+ my $info = shift || ' ';
+ my $hops = shift || get_hops(41);
return "PC41^$call^$sort^$info^$hops^~";
}
return "PC41^$call^$sort^$info^$hops^~";
}
@@
-305,9
+332,11
@@
sub pc49
# 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 = shift;
- $n = 0 unless $n >= 0;
- return "PC50^$main::mycall^$n^H99^";
+ my $self = shift;
+ my $call = $self->call;
+ my $n = shift || '0';
+ my $hops = shift || 'H99';
+ return "PC50^$call^$n^$hops^";
}
# generate pings
}
# generate pings
@@
-330,6
+359,7
@@
sub pc85
my($fromnode, $tonode, $call, $msg) = @_;
return "PC85^$tonode^$fromnode^$call^$msg^~";
}
my($fromnode, $tonode, $call, $msg) = @_;
return "PC85^$tonode^$fromnode^$call^$msg^~";
}
+
1;
__END__
1;
__END__