X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=ba3013389b8f13b26dc6acf7f900621734498e9c;hb=cd5b993f99b52d3c3c51779e9ea1fa150232225e;hp=135ce61aa1072c6a7684a78adc0ffebaffd5200d;hpb=281bb0799ecf66390c48719f76ca5d9f83fe4c73;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 135ce61a..ba301338 100644
--- 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
@@ -46,7 +47,7 @@ sub pc10
 	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) = @_;
@@ -57,6 +58,17 @@ sub pc11
 	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/\^/%5E/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
 {
@@ -117,8 +129,7 @@ sub pc17
 # Request init string
 sub pc18
 {
-	my $flags = " pc9x";
-	$flags .= " xml" if DXXml::available();
+	my $flags = shift;
 	return "PC18^DXSpider Version: $main::version Build: $main::subversion.$main::build$flags^$DXProt::myprot_version^";
 }
 
@@ -138,6 +149,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);
@@ -377,8 +390,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 unless $sort eq 'A';				# only the first slot has an ext.
 	}
 	return $s . '^H99^';
 }
@@ -390,6 +408,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);
 	}
@@ -399,7 +421,7 @@ sub gen_pc92_with_time
 # add a local one
 sub pc92a
 {
-	return _gen_pc92('A', 0, @_);
+	return _gen_pc92('A', 2, @_);
 }
 
 # delete a local one
@@ -414,6 +436,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
 {