X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=822beea5fe7bb3ce5ba0c0beaf81f5c206705f40;hb=d7e79ac62a8403bfdfc40ae69212eb03cff8f7ff;hp=887e0dcb369a084a2fc92e5417784e5658ed7540;hpb=9e2fbafcfdab1ee45e581524311f1a97ac41f6ad;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 887e0dcb..822beea5 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -15,7 +15,7 @@ package DXProt; use DXUtil; use DXM; -use Carp; +use DXDebug; use strict; @@ -27,8 +27,16 @@ use strict; sub pc10 { my ($from, $to, $via, $text) = @_; - my $user2 = $via ? $to : ' '; - my $user1 = $via ? $via : $to; + my ($user1, $user2); + if ($via && $via ne $to) { + $user1 = $via; + $user2 = $to; + } else { + $user2 = ' '; + $user1 = $to; + } +# my $user2 = $via ? $to : ' '; +# my $user1 = $via ? $via : $to; $text = unpad($text); $text = ' ' if !$text; return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~"; @@ -305,8 +313,8 @@ sub pc49 # periodic update of users, plus keep link alive device (always H99) sub pc50 { - my $me = DXCluster->get_exact($main::mycall); - my $n = $me->users ? $me->users : '0'; + my $n = shift; + $n = 0 unless $n >= 0; return "PC50^$main::mycall^$n^H99^"; } @@ -316,5 +324,23 @@ sub pc51 my ($to, $from, $val) = @_; return "PC51^$to^$from^$val^"; } + +# clx remote cmd send +sub pc84 +{ + my($fromnode, $tonode, $call, $msg) = @_; + return "PC84^$tonode^$fromnode^$call^$msg^~"; +} + +# clx remote cmd reply +sub pc85 +{ + my($fromnode, $tonode, $call, $msg) = @_; + return "PC85^$tonode^$fromnode^$call^$msg^~"; +} + 1; __END__ + + +