X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=72595d8a0423ebeebeff7981fbb4cb942cb1d8b3;hb=ed6790555f077eb521b8805113155a2ff99cc47e;hp=cacf60e0c756a67612452ab192bb07c50be157c6;hpb=7ccae7dc99f806c3a0b128a0cf26cf8e489048fb;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index cacf60e0..72595d8a 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -21,10 +21,14 @@ 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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
+use vars qw($sentencelth);
+
+$sentencelth = 180;
+
 #
 # All the PCxx generation routines
 #
@@ -62,14 +66,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^~";
 }
 
 #
@@ -85,15 +90,18 @@ sub pc16
 	my $ncall = $node->call;
 	my @out;
 
-	while (@_) {
-		my $str = "PC16^$ncall";
-		for ( ; @_ && length $str < 200; ) {
-			my $ref = shift;
-			$str .= sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
+		if (length($s) + length($str) > $sentencelth) {
+			push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(16);
-		push @out, $str;
+		$s .= $str;
 	}
+	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
 	return @out;
 }
 
@@ -115,7 +123,9 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $flags = " pc92";
+	$flags .= " xml" if DXXml::available(); 
+	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
 #
@@ -124,20 +134,24 @@ sub pc18
 sub pc19
 {
 	my @out;
-
-	while(@_) {
-		my $str = "PC19";
-		for (; @_ && length $str < 200;) {
-			my $ref = shift;
-			my $call = $ref->call;
-			my $here = $ref->here;
-			my $conf = $ref->conf;
-			my $version = $ref->version;
-			$str .= "^$here^$call^$conf^$version";
+	my @in;
+
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $call = $ref->call;
+		my $here = $ref->here;
+		my $conf = $ref->conf;
+		my $version = $ref->version;
+		my $str = "^$here^$call^$conf^$version";
+		if (length($s) + length($str) > $sentencelth) {
+			push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(19);
-		push @out, $str;
+		$s .= $str;
 	}
+	push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
 	return @out;
 }
 
@@ -210,7 +224,7 @@ sub pc28
 sub pc29 
 {
 	my ($fromnode, $tonode, $stream, $text) = @_;
-	$text = ' ' unless $text && length $text > 0;
+	$text = ' ' unless defined $text && length $text > 0;
 	$text =~ s/\^/%5E/og;			# remove ^
 	return "PC29^$fromnode^$tonode^$stream^$text^~";
 }
@@ -360,35 +374,51 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
-# spider route broadcast
-sub pc90
+# spider route broadcasts
+#
+
+my $_last_time;
+my $_last_occurs;
+
+sub _gen_time
+{
+	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;
+	}
+}
+
+sub _gen_pc92
 {
-	my $node = shift;
 	my $sort = shift;
-	my @out;
-	my $dxchan;
-	my $n = @_;
-	
-	while (@_) {
-		my $str = sprintf "PC90^%s^%X^%s%d", $node->call, $main::systime, $sort, $n-1 ;
-		for (; @_ && length $str < 200;) {
-			my $ref = shift;
-			next if $ref == $main::me;
-			my $call = $ref->call;
-			my $flag = 0;
-			$flag += 1 if $ref->here;
-			$flag += 2 if $ref->conf;
-			if ($ref->is_node) {
-				my $ping = int($ref->pingave * 10);
-				$str .= "^N$flag$call,$ping";
-			} else {
-				$str .= "^U$flag$call";
-			}
-		}
-		$str .= sprintf "^%s^", get_hops(90);
-		push @out, $str;
+	my $ext = $sort eq 'C';
+	my $s = "PC92^" . _encode_pc92_call($main::me, $ext) . "^" . _gen_time . "^$sort";
+	for (@_) {
+		$s .= "^" . _encode_pc92_call($_, $ext);
 	}
-	return @out;
+	return $s . '^H99^';
+}
+
+# add a local one
+sub pc92a
+{
+	return _gen_pc92('A', @_);
+}
+
+# delete a local one
+sub pc92d
+{
+	return _gen_pc92('D', @_);
+}
+
+# send a config
+sub pc92c
+{
+	return _gen_pc92('C', @_);
 }
 
 1;