X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=38ace99bf1cb2ac9e379943a31805f58c23582e1;hb=70908cf7f69eb4fc0caf5d735382bc2c1c1466a3;hp=6894ac7875b6c001a6ff9af56a9338a1a6851c15;hpb=c2c7c24afb2bd2126da043c45bc35ddbf5c327ac;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 6894ac78..38ace99b 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,6 +19,12 @@ 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 #
 # All the PCxx generation routines
 #
@@ -26,7 +32,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,10 +41,11 @@ sub pc10
 		$user2 = ' ';
 		$user1 = $to;
 	}
+	$origin ||= $main::mycall;
 	$text = unpad($text);
 	$text = ' ' unless $text && length $text > 0;
 	$text =~ s/\^/%5E/g;
-	return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";  
+	return "PC10^$from^$user1^$text^*^$user2^$origin^~";  
 }
 
 # create a dx message (call, freq, dxcall, text) 
@@ -67,36 +74,42 @@ sub pc12
 
 #
 # 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;
-	my $i;
 
-	for ($i = 0; @_; ) {
-		my $str = "PC16^$self->{call}";
-		for ( ; @_ && $i < $DXProt::pc16_max_users; $i++) {
+	while (@_) {
+		my $str = "PC16^$ncall";
+		for ( ; @_ && length $str < 200; ) {
 			my $ref = shift;
-			$str .= sprintf "^%s %s %d", $ref->call, $ref->confmode ? '*' : '-', $ref->here;
+			$str .= sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
 		}
 		$str .= sprintf "^%s^", get_hops(16);
 		push @out, $str;
-		$i = 0;
 	}
-	return (@out);
+	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
@@ -110,24 +123,20 @@ sub pc18
 # 
 sub pc19
 {
-	my $self = shift;
 	my @out;
-	my $i;
-	
 
-	for ($i = 0; @_; ) {
+	while(@_) {
 		my $str = "PC19";
-		my $i;
-    
-		for (; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
+		for (; @_ && length $str < 200;) {
 			my $ref = shift;
-			my $here = $ref->{here} ? '1' : '0';
-			my $confmode = $ref->{confmode} ? '1' : '0';
-			$str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
+			my $call = $ref->call;
+			my $here = $ref->here;
+			my $conf = $ref->conf;
+			my $version = $ref->version;
+			$str .= "^$here^$call^$conf^$version";
 		}
 		$str .= sprintf "^%s^", get_hops(19);
 		push @out, $str;
-		$i = 0;
 	}
 	return @out;
 }
@@ -141,10 +150,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
@@ -159,7 +172,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^";
 }
@@ -189,6 +202,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^~";
 }
 
@@ -246,8 +260,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
@@ -270,9 +283,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^~";
 }
 
@@ -316,9 +332,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
@@ -342,6 +360,40 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
+# spider route broadcast
+sub pc90
+{
+	my $node = shift;
+	my $sort = shift;
+	my @out;
+	my $dxchan;
+	
+	while (@_) {
+		my $str = '';
+		for (; @_ && length $str <= 230;) {
+			my $ref = shift;
+			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";
+				my $v = $ref->build || $ref->version;
+				$str .= ",$v" if defined $v;
+			} else {
+				$str .= "^U$flag$call";
+			}
+		}
+		push @out, $str if $str;
+	}
+	my $n = @out;
+	my $h = get_hops(90);
+	@out = map { sprintf "PC90^%s^%X^%s%d%s^%s^", $node->call, $main::systime, $sort, --$n, $_, $h } @out;
+	return @out;
+}
+
 1;
 __END__