X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=07d5a0e98baeb9f51173797efd3101f1412d0a7e;hb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;hp=9fb0b7113b3da06728e592f38a490af021caae47;hpb=fdc1150da7dbd9c1094d8df7a4744fb917017ed2;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 9fb0b711..07d5a0e9 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -15,6 +15,7 @@ package DXProt;
 
 use DXUtil;
 use DXM;
+use Carp;
 
 use strict;
 
@@ -22,23 +23,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 +47,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^~";
 }
 
 #
@@ -88,13 +87,14 @@ sub pc17
 {
   my ($self, $ref) = @_;
   my $hops = get_hops(17);
-  return "PC17^$self->{call}^$ref->{call}^$hops^";
+  return "PC17^$ref->{call}^$self->{call}^$hops^";
 }
 
 # Request init string
 sub pc18
 {
-  return "PC18^wot a load of twaddle^$DXProt::myprot_version^~";
+	my $info = DXCluster::cluster;
+	return "PC18^$info^$DXProt::myprot_version^~";
 }
 
 #
@@ -106,12 +106,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;
@@ -128,8 +130,7 @@ sub pc20
 # delete a node
 sub pc21
 {
-  my ($ref, $reason) = @_;
-  my $call = $ref->call;
+  my ($call, $reason) = @_;
   my $hops = get_hops(21);
   $reason = "Gone." if !$reason;
   return "PC21^$call^$reason^$hops^";
@@ -141,6 +142,78 @@ 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^";
+}
+
+# message start (fromnode, tonode, to, from, t, private, subject, origin)
+sub pc28
+{
+  my ($tonode, $fromnode, $to, $from, $t, $private, $subject, $origin, $rr) = @_;
+  my $date = cldate($t);
+  my $time = ztime($t);
+  $private = $private ? '1' : '0';
+  $rr = $rr ? '1' : '0';
+  return "PC28^$tonode^$fromnode^$to^$from^$date^$time^$private^$subject^ ^5^$rr^ ^$origin^~";
+}
+
+# message text (from and to node same way round as pc29)
+sub pc29 
+{
+  my ($fromnode, $tonode, $stream, $text) = @_;
+  $text =~ s/\^//og;        # remove ^
+  return "PC29^$fromnode^$tonode^$stream^$text^~";
+}
+
+# subject acknowledge (will have to and from node reversed to pc28)
+sub pc30
+{
+  my ($fromnode, $tonode, $stream) = @_;
+  return "PC30^$fromnode^$tonode^$stream^";
+}
+
+# acknowledge this tranche of lines (to and from nodes reversed to pc29 and pc28
+sub pc31
+{
+  my ($fromnode, $tonode, $stream) = @_;
+  return "PC31^$fromnode^$tonode^$stream^";
+}
+
+#  end of message from the sending end (pc28 node order)
+sub pc32
+{
+  my ($fromnode, $tonode, $stream) = @_;
+  return "PC32^$fromnode^$tonode^$stream^";
+}
+
+# acknowledge end of message from receiving end (opposite pc28 node order)
+sub pc33
+{
+  my ($fromnode, $tonode, $stream) = @_;
+  return "PC33^$fromnode^$tonode^$stream^";
+}
+
+# remote cmd send
+sub pc34
+{
+	my($fromnode, $tonode, $msg) = @_;
+	return "PC34^$tonode^$fromnode^$msg^~";
+}
+
+# remote cmd reply
+sub pc35
+{
+	my($fromnode, $tonode, $msg) = @_;
+	return "PC35^$tonode^$fromnode^$msg^~";
+}
+
 # send all the DX clusters I reckon are connected
 sub pc38
 {
@@ -154,10 +227,52 @@ sub pc38
   return "PC38^" . join(',', @nodes) . "^~";
 }
 
+# tell the local node to discconnect
+sub pc39
+{
+  my ($call, $reason) = @_;
+  my $hops = get_hops(39);
+  $reason = "Gone." if !$reason;
+  return "PC39^$call^$reason^$hops^";
+}
+
+# cue up bulletin or file for transfer
+sub pc40
+{
+  my ($to, $from, $fn, $bull) = @_;
+  $bull = $bull ? '1' : '0';
+  return "PC40^$to^$from^$fn^$bull^5^";
+}
+
+# user info
+sub pc41
+{
+  my ($call, $sort, $info) = @_;
+  my $hops = get_hops(41);
+  $sort = $sort ? "$sort" : '0';
+  return "PC41^$call^$sort^$info^$hops^~";
+}
+
+# abort message
+sub pc42
+{
+  my ($fromnode, $tonode, $stream) = @_;
+  return "PC42^$fromnode^$tonode^$stream^";
+}
+
+# bull delete
+sub pc49
+{
+  my ($from, $subject) = @_;
+  my $hops = get_hops(49);
+  return "PC49^$from^$subject^$hops^~";
+}
+
 # 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^";
 }