X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=4fbb581c08e7ec70cc69bb569b8727a9929630f2;hb=cbda6153fad2adddb58ee5a87f3981aa2ad754ad;hp=657057c9e03cbb99f056457018714bdc050af177;hpb=6181396aed78196fdff45033de7b59d6a2fcd6c1;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 657057c9..4fbb581c 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -20,12 +20,9 @@ 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 $handle_xml);
+use vars qw($sentencelth);
 
 $sentencelth = 180;
 
@@ -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,8 +120,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-	my $flags = "";
-	$flags .= " xml" if $handle_xml; 
+	my $flags = " pc9x";
+	$flags .= " xml" if DXXml::available(); 
 	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
@@ -374,9 +371,61 @@ 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, @_);
+}
+
+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
+	$line = unpad($line);
+	$line =~ s/\^/\\5E/g;		# remove any ^ characters
+	return "PC93^$main::mycall^" . gen_pc9x_t() . "^$to^$from^$via^$line^H99^";
 }
 
 1;