X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=ec2201cee725b941dcff95c9c8f682dcd5cea038;hb=f63d598af3f797b56b8d5e23ec4ff5254192eee9;hp=75903f02912e25b2d0c29b808635a8779f799415;hpb=937b3f6592ae13be16dfe171b30817ee39d27bf0;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 75903f02..ec2201ce 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -11,7 +11,7 @@
 
 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 $pc19_version);
+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
 {
@@ -118,7 +130,7 @@ sub pc17
 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^";
 }
 
 #
@@ -378,9 +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);
-		$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^';
 }
@@ -392,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);
 	}
@@ -401,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
@@ -421,7 +441,7 @@ sub pc92k
 {
 	my $nref = shift;
 	my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K";
-	$s .= "^" . _encode_pc92_call($nref, 1);
+	$s .= "^" . _encode_pc92_call($nref, 1) . ":$main::me->{build}";
 	$s .= "^" . scalar $nref->nodes;
 	$s .= "^" . scalar $nref->users;
 	return $s . '^H99^';