X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=f6f9a39c81691c3179c6db372db0b9a1d09a9cea;hb=b3099da00e84f1ed5cba3cdb263c8a6b8ec27e05;hp=180ce526ef17357c67d474bc45c34b9994e0b368;hpb=22df46c61d3f1ae4115224bcc230ffe7ed6aff99;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 180ce526..f6f9a39c 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,15 +20,12 @@ use DXDebug;
 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,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw($sentencelth);
 
 $sentencelth = 180;
- 
+
 #
 # All the PCxx generation routines
 #
@@ -66,14 +63,15 @@ sub pc11
 # create an announce message
 sub pc12
 {
-	my ($call, $text, $tonode, $sysop, $wx) = @_;
+	my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
 	my $hops = get_hops(12);
-	$sysop = ' ' if !$sysop;
-	$text = ' ' if !$text;
-	$wx = '0' if !$wx;
-	$tonode = '*' if !$tonode;
+	$text ||= ' ';
 	$text =~ s/\^/%5E/g;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #
@@ -122,7 +120,9 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $flags = " pc9[2]";
+	$flags .= " xml" if DXXml::available(); 
+	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
 #
@@ -371,9 +371,50 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
-# spider route broadcast
-sub pc90
+# spider route broadcasts
+#
+
+
+sub _gen_pc92
+{
+	my $sort = shift;
+	my $ext = shift;
+	my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort";
+	for (@_) {
+		$s .= "^" . _encode_pc92_call($_, $ext);
+	}
+	return $s . '^H99^';
+}
+
+sub gen_pc92_with_time
+{
+	my $call = shift;
+	my $sort = shift;
+	my $t = shift;
+	my $ext = 1;
+	my $s = "PC92^$call^$t^$sort";
+	for (@_) {
+		$s .= "^" . _encode_pc92_call($_, $ext);
+	}
+	return $s . '^H99^';
+}
+
+# add a local one
+sub pc92a
+{
+	return _gen_pc92('A', 0, @_);
+}
+
+# delete a local one
+sub pc92d
+{
+	return _gen_pc92('D', 0, @_);
+}
+
+# send a config
+sub pc92c
 {
+	return _gen_pc92('C', 1, @_);
 }
 
 1;