X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=63bc5a3b08a5ba8fbb88abc8b49eaab1dfe2efca;hb=57c9c65161ea49fee9d6f22be329f2faa490a46f;hp=ea8007267c062e238b99e77e51e466cc0246a784;hpb=1be52e58e3cb8a1746bd583b1b1e311602bb1935;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index ea800726..63bc5a3b 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,10 +20,7 @@ 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);
 
@@ -38,7 +35,7 @@ sub pc10
 {
 	my ($from, $to, $via, $text, $origin) = @_;
 	my ($user1, $user2);
-	if ($via && $via ne $to) {
+	if ($via && $via ne $to && $via ne '*') {
 		$user1 = $via;
 		$user2 = $to;
 	} else {
@@ -123,7 +120,7 @@ sub pc17
 # Request init string
 sub pc18
 {
-	my $flags = " pc92";
+	my $flags = " pc9x";
 	$flags .= " xml" if DXXml::available(); 
 	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
@@ -377,26 +374,25 @@ sub pc85
 # spider route broadcasts
 #
 
-my $_last_time;
-my $_last_occurs;
 
-sub _gen_time
+sub _gen_pc92
 {
-	if (!$_last_time || $_last_time != $main::systime) {
-		$_last_time = $main::systime;
-		$_last_occurs = 0;
-		return $_last_time;
-	} else {
-		$_last_occurs++;
-		return sprintf "$_last_time.%02d", $_last_occurs;
+	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
+sub gen_pc92_with_time
 {
+	my $call = shift;
 	my $sort = shift;
-	my $ext = $sort eq 'C';
-	my $s = "PC92^$main::mycall^" . _gen_time . "^$sort";
+	my $t = shift;
+	my $ext = 1;
+	my $s = "PC92^$call^$t^$sort";
 	for (@_) {
 		$s .= "^" . _encode_pc92_call($_, $ext);
 	}
@@ -406,19 +402,35 @@ sub _gen_pc92
 # add a local one
 sub pc92a
 {
-	return _gen_pc92('A', @_);
+	return _gen_pc92('A', 0, @_);
 }
 
 # delete a local one
 sub pc92d
 {
-	return _gen_pc92('D', @_);
+	return _gen_pc92('D', 0, @_);
 }
 
 # send a config
 sub pc92c
 {
-	return _gen_pc92('C', @_);
+	return _gen_pc92('C', 1, @_);
+}
+
+sub pc93
+{
+	my $to = shift;				# *, callsign, chat group name, sysop
+	my $from = shift;			# from user callsign
+	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";
+	$s .= "^$origin" if $origin;
+	$s .= "^H99^";
+	return $s;
 }
 
 1;