X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=4f2e8deac98e22e735b0bee7bf961f78b289679a;hb=171a7a0bf86e9732a33c7829e808129ec01c51c2;hp=66252c7aac3f441dfa67813e2ee264cdc10bf5dc;hpb=21e7642d216656c60b164d76208633a0c81cf5db;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 66252c7a..4f2e8dea 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -22,23 +22,21 @@ use strict;
 # All the PCxx generation routines
 #
 
-# create a talk string (called $self->pc10(...)
+# create a talk string ($from, $to, $via, $text)
 sub pc10
 {
-  my ($self, $to, $via, $text) = @_;
+  my ($from, $to, $via, $text) = @_;
   my $user2 = $via ? $to : ' ';
   my $user1 = $via ? $via : $to;
-  my $mycall = $self->call;
   $text = unpad($text);
   $text = ' ' if !$text;
-  return "PC10^$mycall^$user1^$text^*^$user2^$main::mycall^~";  
+  return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";  
 }
 
-# create a dx message (called $self->pc11(...)
+# create a dx message (call, freq, dxcall, text) 
 sub pc11
 {
-  my ($self, $freq, $dxcall, $text) = @_;
-  my $mycall = $self->call;
+  my ($mycall, $freq, $dxcall, $text) = @_;
   my $hops = get_hops(11);
   my $t = time;
   $text = ' ' if !$text;
@@ -48,13 +46,13 @@ sub pc11
 # create an announce message
 sub pc12
 {
-  my ($self, $text, $tonode, $sysop, $wx) = @_;
+  my ($call, $text, $tonode, $sysop, $wx) = @_;
   my $hops = get_hops(12);
-  $sysop = $sysop ? '*' : ' ';
+  $sysop = ' ' if !$sysop;
   $text = ' ' if !$text;
   $wx = '0' if !$wx;
   $tonode = '*' if !$tonode;
-  return "PC12^$self->{call}^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+  return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
 }
 
 #
@@ -69,11 +67,11 @@ sub pc16
   my $self = shift;
   my @out;
 
-  while (@_) {
+  foreach (@_) {
     my $str = "PC16^$self->{call}";
     my $i;
     
-    for ($i = 0; @_ && $i < $DXProt::pc16_max_users; $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;
 	}
@@ -86,9 +84,9 @@ sub pc16
 # remove a local user
 sub pc17
 {
-  my $self = shift;
+  my ($self, $ref) = @_;
   my $hops = get_hops(17);
-  return "PC17^$self->{call}^$main::mycall^$hops^";
+  return "PC17^$self->{call}^$ref->{call}^$hops^";
 }
 
 # Request init string
@@ -106,12 +104,14 @@ sub pc19
   my @out;
 
   while (@_) {
-    my $str = "PC19^$self->{call}";
+    my $str = "PC19";
     my $i;
     
     for ($i = 0; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
       my $ref = shift;
-      $str .= "^$ref->{here}^$ref->{call}^$ref->{confmode}^$ref->{pcversion}";
+	  my $here = $ref->{here} ? '1' : '0';
+	  my $confmode = $ref->{confmode} ? '1' : '0';
+      $str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
 	}
     $str .= sprintf "^%s^", get_hops(19);
 	push @out, $str;
@@ -141,6 +141,17 @@ sub pc22
   return 'PC22^';
 }
 
+# here status
+sub pc24
+{
+  my $self = shift;
+  my $call = $self->call;
+  my $flag = $self->here ? '1' : '0';
+  my $hops = get_hops(24);
+  
+  return "PC24^$call^$flag^$hops^";
+}
+
 # send all the DX clusters I reckon are connected
 sub pc38
 {
@@ -154,10 +165,21 @@ sub pc38
   return "PC38^" . join(',', @nodes) . "^~";
 }
 
+# tell the local node to discconnect
+sub pc39
+{
+  my ($ref, $reason) = @_;
+  my $call = $ref->call;
+  my $hops = get_hops(21);
+  $reason = "Gone." if !$reason;
+  return "PC39^$call^$reason^";
+}
+
 # periodic update of users, plus keep link alive device (always H99)
 sub pc50
 {
-  my $n = DXNodeuser->count;
+  my $me = DXCluster->get($main::mycall);
+  my $n = $me->users ? $me->users : '0';
   return "PC50^$main::mycall^$n^H99^";
 }