X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=5962665c482b942122fe307b3a89eabf8715778d;hb=8c23f70c2487e906a80ef323763cb7cb123baf28;hp=1ef9c022a24d996c865ab162200f280cf4dc01f8;hpb=0dc47d7ba34d8ea89f210c024863d01b2b32122b;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 1ef9c022..5962665c 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -25,9 +25,10 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0))
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($sentencelth);
+use vars qw($sentencelth $use_newroute);
 
-$sentencelth = 200;
+$sentencelth = 180;
+$use_newroute = 1;
  
 #
 # All the PCxx generation routines
@@ -66,14 +67,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;
+	$origin ||= $main::mycall;
+	$sysop ||= ' ';
+	$text ||= ' ';
+	$wx ||= '0';
+	$tonode ||= '*';
 	$text =~ s/\^/%5E/g;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #
@@ -94,13 +96,13 @@ sub pc16
 		next unless $_;
 		my $ref = $_;
 		my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
-		if (length($s) + length($str) >= $sentencelth) {
+		if (length($s) + length($str) > $sentencelth) {
 			push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
 			$s = "";
 		}
 		$s .= $str;
 	}
-	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16) if length $s;
+	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
 	return @out;
 }
 
@@ -122,7 +124,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $nr = $use_newroute ? ' !NRt' : '';
+	return "PC18^DXSpider Version: $main::version Build: $main::build$nr^$DXProt::myprot_version^";
 }
 
 #
@@ -141,14 +144,14 @@ sub pc19
 		my $here = $ref->here;
 		my $conf = $ref->conf;
 		my $version = $ref->version;
-	    my $str = "^$here^$call^$conf^$version";
-		if (length($s) + length($str) >= $sentencelth) {
+		my $str = "^$here^$call^$conf^$version";
+		if (length($s) + length($str) > $sentencelth) {
 			push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
 			$s = "";
 		}
 		$s .= $str;
 	}
-	push @out, "PC19" . $s . sprintf "^%s^", get_hops(19) if length $s;
+	push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
 	return @out;
 }
 
@@ -357,6 +360,69 @@ sub pc51
 	return "PC51^$to^$from^$val^";
 }
 
+my $hexlasttime = 0;
+my $hexlastlet = 'A';
+
+sub hexstamp
+{
+	my $t = shift || $main::systime;
+	if ($t ne $hexlasttime) {
+		$hexlasttime = $t;
+		$hexlastlet = 'A';
+	} else {
+		do {
+			$hexlastlet = chr(ord($hexlastlet) + 1);
+		} while ($hexlastlet eq '^');
+	}
+	return sprintf "%s%08X", $hexlastlet, $hexlasttime;
+}
+
+sub pc58
+{
+	my $sort = shift;
+	my $hexstamp = shift || hexstamp();
+	my $from = shift;
+	my $to = shift;
+	my $text = unpad(shift);
+	$text = ' ' if !$text;
+	$text =~ s/\^/%5E/g;
+	return "PC58^$sort^$hexstamp^$from^$to^$text" . sprintf "^%s^", get_hops(58);
+}
+
+sub pc59
+{
+	my @out;
+	my $sort = shift;
+	my $hexstamp = shift || hexstamp();
+	my $node = shift;
+	
+	my $s = "PC59^$sort^$hexstamp^$node";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $call = $ref->call;
+		my $here = $ref->here;
+		$s .= $ref->isa('Route::Node') ? "^N$here$call" : "^U$here$call";
+	}
+	push @out, sprintf "$s^%s^", get_hops(59);
+	return @out;
+}
+
+sub PC59c
+{
+	return PC59('C', @_);
+}
+
+sub PC59a
+{
+	return PC59('A', @_);
+}
+
+sub PC59d
+{
+	return PC59('D', @_);
+}
+
 # clx remote cmd send
 sub pc84
 {