make it (seem to) work under perl 5.10

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index e00e1d724f3e44618b782a249bea0a172ca0fee9..6ee0c4984a40799ccf9833e19ebe794d36ea930a 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -6,12 +6,12 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
-# 
+#
+#
 
 package DXProt;
 
-@ISA = qw(DXProt DXChannel);
+@ISA = qw(DXChannel);
 
 use DXUtil;
 use DXM;
@@ -19,9 +19,10 @@ use DXDebug;
 
 use strict;
 
-use vars qw($sentencelth);
+use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot);
 
 $sentencelth = 180;
+$pc9x_nodupe_first_slot = 1;
 
 #
 # All the PCxx generation routines
@@ -43,10 +44,10 @@ sub pc10
        $text = unpad($text);
        $text = ' ' unless $text && length $text > 0;
        $text =~ s/\^/%5E/g;
-       return "PC10^$from^$user1^$text^*^$user2^$origin^~";  
+       return "PC10^$from^$user1^$text^*^$user2^$origin^~";
 }
 
-# create a dx message (call, freq, dxcall, text) 
+# create a dx message (call, freq, dxcall, text)
 sub pc11
 {
        my ($mycall, $freq, $dxcall, $text) = @_;
@@ -72,8 +73,8 @@ sub pc12
 }
 
 #
-# add one or more users (I am expecting references that have 'call', 
-# 'conf' & 'here' method) 
+# add one or more users (I am expecting references that have 'call',
+# 'conf' & 'here' method)
 #
 # this will create a list of PC16 with up pc16_max_users in each
 # called $self->pc16(..)
@@ -109,7 +110,7 @@ sub pc17
                my $hops = get_hops(17);
                my $ncall = $node->call;
                my $ucall = $ref->call;
-               push @out, "PC17^$ucall^$ncall^$hops^"; 
+               push @out, "PC17^$ucall^$ncall^$hops^";
        }
        return @out;
 }
@@ -117,14 +118,13 @@ sub pc17
 # Request init string
 sub pc18
 {
-       my $flags = " pc9x";
-       $flags .= " xml" if DXXml::available(); 
-       return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
+       my $flags = shift;
+       return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^";
 }
 
 #
-# add one or more nodes 
-# 
+# add one or more nodes
+#
 sub pc19
 {
        my @out;
@@ -138,6 +138,8 @@ sub pc19
                my $here = $ref->here;
                my $conf = $ref->conf;
                my $version = $ref->version;
+               $version = $pc19_version unless $version =~ /^\d\d\d\d$/;
+
                my $str = "^$here^$call^$conf^$version";
                if (length($s) + length($str) > $sentencelth) {
                        push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
@@ -181,12 +183,12 @@ sub pc24
        my $call = $self->call;
        my $flag = $self->here ? '1' : '0';
        my $hops = shift || get_hops(24);
-  
+
        return "PC24^$call^$flag^$hops^";
 }
 
 
-# create a merged dx message (freq, dxcall, t, text, spotter, orig-node) 
+# create a merged dx message (freq, dxcall, t, text, spotter, orig-node)
 sub pc26
 {
        my ($freq, $dxcall, $t, $text, $spotter, $orignode) = @_;
@@ -215,7 +217,7 @@ sub pc28
 }
 
 # message text (from and to node same way round as pc29)
-sub pc29 
+sub pc29
 {
        my ($fromnode, $tonode, $stream, $text) = @_;
        $text = ' ' unless defined $text && length $text > 0;
@@ -293,7 +295,7 @@ sub pc41
 {
        my $call = shift;
        $call = shift if ref $call;
-       
+
        my $sort = shift || '0';
        my $info = shift || ' ';
        my $hops = shift || get_hops(41);
@@ -377,8 +379,13 @@ sub _gen_pc92
        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);
+               $s .= '^' . _encode_pc92_call($_, $ext);
+               $ext = 0;                               # only the first slot has an ext.
        }
        return $s . '^H99^';
 }
@@ -390,6 +397,10 @@ sub gen_pc92_with_time
        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);
        }
@@ -414,6 +425,17 @@ sub pc92c
        return _gen_pc92('C', 1, @_);
 }
 
+# send a keep alive
+sub pc92k
+{
+       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
 sub pc92f
 {
@@ -439,7 +461,7 @@ sub pc93
        my $via = shift || '*';                 # *, node call
        my $line = shift;                       # the text
        my $origin = shift;                     # this will be present on proxying from PC10
-       
+
        $line = unpad($line);
        $line =~ s/\^/\\5E/g;           # remove any ^ characters
        my $s = "PC93^$main::mycall^" . gen_pc9x_t() . "^$to^$from^$via^$line";