X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=07d5a0e98baeb9f51173797efd3101f1412d0a7e;hb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;hp=4f2e8deac98e22e735b0bee7bf961f78b289679a;hpb=171a7a0bf86e9732a33c7829e808129ec01c51c2;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 4f2e8dea..07d5a0e9 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -15,6 +15,7 @@ package DXProt; use DXUtil; use DXM; +use Carp; use strict; @@ -86,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^~"; } # @@ -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^"; @@ -152,6 +153,67 @@ sub pc24 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 { @@ -168,11 +230,42 @@ sub pc38 # tell the local node to discconnect sub pc39 { - my ($ref, $reason) = @_; - my $call = $ref->call; - my $hops = get_hops(21); + my ($call, $reason) = @_; + my $hops = get_hops(39); $reason = "Gone." if !$reason; - return "PC39^$call^$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)