X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=82905dadbcd81780ebe185abcbbcef5fc9ec0dc3;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=8de0185b10b22fb45c84b3ea3a2d11246fe71dc9;hpb=8f391050421dd665bbf5fdcb3279a6074d97a74e;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 8de0185b..82905dad 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,6 +19,10 @@ use DXDebug;
 
 use strict;
 
+use vars qw($sentencelth);
+
+$sentencelth = 180;
+
 #
 # All the PCxx generation routines
 #
@@ -26,7 +30,7 @@ use strict;
 # create a talk string ($from, $to, $via, $text)
 sub pc10
 {
-	my ($from, $to, $via, $text) = @_;
+	my ($from, $to, $via, $text, $origin) = @_;
 	my ($user1, $user2);
 	if ($via && $via ne $to) {
 		$user1 = $via;
@@ -35,9 +39,11 @@ sub pc10
 		$user2 = ' ';
 		$user1 = $to;
 	}
+	$origin ||= $main::mycall;
 	$text = unpad($text);
 	$text = ' ' unless $text && length $text > 0;
-	return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";  
+	$text =~ s/\^/%5E/g;
+	return "PC10^$from^$user1^$text^*^$user2^$origin^~";  
 }
 
 # create a dx message (call, freq, dxcall, text) 
@@ -47,60 +53,73 @@ sub pc11
 	my $hops = get_hops(11);
 	my $t = time;
 	$text = ' ' if !$text;
+	$text =~ s/\^/%5E/g;
 	return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
 }
 
 # 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;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	$text ||= ' ';
+	$text =~ s/\^/%5E/g;
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #
 # add one or more users (I am expecting references that have 'call', 
-# 'confmode' & 'here' method) 
+# 'conf' & 'here' method) 
 #
 # this will create a list of PC16 with up pc16_max_users in each
 # called $self->pc16(..)
 #
 sub pc16
 {
-	my $self = shift;
+	my $node = shift;
+	my $ncall = $node->call;
 	my @out;
 
-	foreach (@_) {
-		my $str = "PC16^$self->{call}";
-		my $i;
-    
-		for ($i = 0; @_ > 0  && $i < $DXProt::pc16_max_users; $i++) {
-			my $ref = shift;
-			$str .= sprintf "^%s %s %d", $ref->call, $ref->confmode ? '*' : '-', $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;
 	}
-	return (@out);
+	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
+	return @out;
 }
 
 # remove a local user
 sub pc17
 {
-	my ($self, $ref) = @_;
-	my $hops = get_hops(17);
-	return "PC17^$ref->{call}^$self->{call}^$hops^";
+	my @out;
+	while (@_) {
+		my $node = shift;
+		my $ref = shift;
+		my $hops = get_hops(17);
+		my $ncall = $node->call;
+		my $ucall = $ref->call;
+		push @out, "PC17^$ucall^$ncall^$hops^"; 
+	}
+	return @out;
 }
 
 # Request init string
 sub pc18
 {
-	my $info = DXCluster::cluster;
-	return "PC18^$info^$DXProt::myprot_version^";
+	my $flags = "";
+	$flags .= " xml" if DXXml::available(); 
+	return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^";
 }
 
 #
@@ -108,22 +127,25 @@ sub pc18
 # 
 sub pc19
 {
-	my $self = shift;
 	my @out;
-
-	while (@_) {
-		my $str = "PC19";
-		my $i;
-    
-		for ($i = 0; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
-			my $ref = shift;
-			my $here = $ref->{here} ? '1' : '0';
-			my $confmode = $ref->{confmode} ? '1' : '0';
-			$str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
+	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;
 }
 
@@ -136,10 +158,14 @@ sub pc20
 # delete a node
 sub pc21
 {
-	my ($call, $reason) = @_;
-	my $hops = get_hops(21);
-	$reason = "Gone." if !$reason;
-	return "PC21^$call^$reason^$hops^";
+	my @out;
+	while (@_) {
+		my $node = shift;
+		my $hops = get_hops(21);
+		my $call = $node->call;
+		push @out, "PC21^$call^Gone^$hops^";
+	}
+	return @out;
 }
 
 # end of init phase
@@ -154,7 +180,7 @@ sub pc24
 	my $self = shift;
 	my $call = $self->call;
 	my $flag = $self->here ? '1' : '0';
-	my $hops = get_hops(24);
+	my $hops = shift || get_hops(24);
   
 	return "PC24^$call^$flag^$hops^";
 }
@@ -184,6 +210,7 @@ sub pc28
 	my $time = ztime($t);
 	$private = $private ? '1' : '0';
 	$rr = $rr ? '1' : '0';
+	$subject ||= ' ';
 	return "PC28^$tonode^$fromnode^$to^$from^$date^$time^$private^$subject^ ^5^$rr^ ^$origin^~";
 }
 
@@ -191,7 +218,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^~";
 }
@@ -241,8 +268,7 @@ sub pc35
 # send all the DX clusters I reckon are connected
 sub pc38
 {
-	my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
-	return "PC38^" . join(',', @nodes) . "^~";
+	return join '^', "PC38", map {$_->call} Route::Node::get_all();
 }
 
 # tell the local node to discconnect
@@ -265,9 +291,12 @@ sub pc40
 # user info
 sub pc41
 {
-	my ($call, $sort, $info) = @_;
-	my $hops = get_hops(41);
-	$sort = $sort ? "$sort" : '0';
+	my $call = shift;
+	$call = shift if ref $call;
+	
+	my $sort = shift || '0';
+	my $info = shift || ' ';
+	my $hops = shift || get_hops(41);
 	return "PC41^$call^$sort^$info^$hops^~";
 }
 
@@ -311,9 +340,11 @@ sub pc49
 # periodic update of users, plus keep link alive device (always H99)
 sub pc50
 {
-	my $n = shift;
-	$n = 0 unless $n >= 0;
-	return "PC50^$main::mycall^$n^H99^";
+	my $self = shift;
+	my $call = $self->call;
+	my $n = shift || '0';
+	my $hops = shift || 'H99';
+	return "PC50^$call^$n^$hops^";
 }
 
 # generate pings
@@ -337,6 +368,11 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
+# spider route broadcast
+sub pc90
+{
+}
+
 1;
 __END__