X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=5347ce21f5e55768b7daf30001ee97ff626357b2;hb=b72f2581870f11b7e78ca7add1e9fea856145f02;hp=c024724f44ee51f8ac48d5f092c6a85dbdae41d2;hpb=3065f0dd2c80cd59b7a2b17d397a343b6521b1f4;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index c024724f..5347ce21 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -19,9 +19,10 @@ use DXDebug; use strict; -use vars qw($sentencelth); +use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot); $sentencelth = 180; +$pc9x_nodupe_first_slot = 1; # # All the PCxx generation routines @@ -137,6 +138,8 @@ sub pc19 my $here = $ref->here; my $conf = $ref->conf; my $version = $ref->version; + $version = $pc19_version unless $version =~ /^\d\d\d\d$/; + my $str = "^$here^$call^$conf^$version"; if (length($s) + length($str) > $sentencelth) { push @out, "PC19" . $s . sprintf "^%s^", get_hops(19); @@ -376,8 +379,13 @@ sub _gen_pc92 my $sort = shift; my $ext = shift; my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort"; + if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) { + shift; + $s .= '^'; + } for (@_) { - $s .= "^" . _encode_pc92_call($_, $ext); + $s .= '^' . _encode_pc92_call($_, $ext); + $ext = 0; # only the first slot has an ext. } return $s . '^H99^'; } @@ -389,6 +397,10 @@ sub gen_pc92_with_time my $t = shift; my $ext = 1; my $s = "PC92^$call^$t^$sort"; + if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) { + shift; + $s .= '^'; + } for (@_) { $s .= "^" . _encode_pc92_call($_, $ext); } @@ -413,6 +425,17 @@ sub pc92c return _gen_pc92('C', 1, @_); } +# send a keep alive +sub pc92k +{ + my $nref = shift; + my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K"; + $s .= "^" . _encode_pc92_call($nref, 1); + $s .= "^" . scalar $nref->nodes; + $s .= "^" . scalar $nref->users; + return $s . '^H99^'; +} + # send a 'find' message sub pc92f {