package DXProt;
-@ISA = qw(DXProt DXChannel);
+@ISA = qw(DXChannel);
use DXUtil;
use DXM;
use strict;
-use vars qw($sentencelth $pc19_version);
+use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot);
$sentencelth = 180;
+$pc9x_nodupe_first_slot = 1;
#
# All the PCxx generation routines
$origin ||= $main::mycall;
$text = unpad($text);
$text = ' ' unless $text && length $text > 0;
- $text =~ s/\^/%5E/g;
+ $text =~ s/\^/~/g;
return "PC10^$from^$user1^$text^*^$user2^$origin^~";
}
-# create a dx message (call, freq, dxcall, text)
+# create a dx message (call, freq, dxcall, text) see also pc61
sub pc11
{
my ($mycall, $freq, $dxcall, $text) = @_;
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
- $text =~ s/\^/%5E/g;
+ $text =~ s/\^/~/g;
return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
}
+# create a dx message (call, freq, dxcall, text, $ipaddr) see also pc11
+sub pc61
+{
+ my ($mycall, $freq, $dxcall, $text, $ipaddr) = @_;
+ my $hops = get_hops(61) || get_hops(11);
+ my $t = time;
+ $text = ' ' if !$text;
+ $text =~ s/\^/~/g;
+ return sprintf "PC61^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$ipaddr^$hops^~", $freq, cldate($t), ztime($t);
+}
+
# create an announce message
sub pc12
{
my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
my $hops = get_hops(12);
$text ||= ' ';
- $text =~ s/\^/%5E/g;
+ $text =~ s/\^/~/g;
$tonode ||= '*';
$sysop ||= ' ';
$wx ||= '0';
sub pc18
{
my $flags = shift;
- return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^";
+ return "PC18^DXSpider Version: $main::version Build: $main::build Git: $main::gitbranch/$main::gitversion$flags^$DXProt::myprot_version^";
}
#
{
my ($fromnode, $tonode, $stream, $text) = @_;
$text = ' ' unless defined $text && length $text > 0;
- $text =~ s/\^/%5E/og; # remove ^
+ $text =~ s/\^/~/g; # remove ^
return "PC29^$fromnode^$tonode^$stream^$text^~";
}
my $sort = shift;
my $ext = shift;
my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort";
+ if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+ shift;
+ $s .= '^';
+ }
for (@_) {
- $s .= "^" . _encode_pc92_call($_, $ext);
- $ext = 0; # only the first slot has an ext.
+ $s .= '^' . _encode_pc92_call($_, $ext);
+ $ext = 0 unless $sort eq 'A'; # only the first slot has an ext.
}
return $s . '^H99^';
}
my $t = shift;
my $ext = 1;
my $s = "PC92^$call^$t^$sort";
+ if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+ shift;
+ $s .= '^';
+ }
for (@_) {
$s .= "^" . _encode_pc92_call($_, $ext);
}
# add a local one
sub pc92a
{
- return _gen_pc92('A', 0, @_);
+ return _gen_pc92('A', 2, @_);
}
# delete a local one
# send a keep alive
sub pc92k
{
- return _gen_pc92('K', 1, @_);
+ my $nref = shift;
+ my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K";
+ $s .= "^" . _encode_pc92_call($nref, 1) . ":$main::me->{build}";
+ $s .= "^" . scalar $nref->nodes;
+ $s .= "^" . scalar $nref->users;
+ return $s . '^H99^';
}
# send a 'find' message
my $origin = shift; # this will be present on proxying from PC10
$line = unpad($line);
- $line =~ s/\^/\\5E/g; # remove any ^ characters
+ $line =~ s/\^/~/g; # remove any ^ characters
my $s = "PC93^$main::mycall^" . gen_pc9x_t() . "^$to^$from^$via^$line";
$s .= "^$origin" if $origin;
$s .= "^H99^";