X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=f01a1481cc0a06681bc3ceccc065809f0c63f20e;hb=refs%2Fheads%2Fip_address;hp=2325e7a5cb36c9c9d1bfd51531c3638d3e315314;hpb=7e2b5e1e1f0543a093151889d6e76bcce82bae86;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 2325e7a5..f01a1481 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -11,7 +11,7 @@ package DXProt; -@ISA = qw(DXProt DXChannel); +@ISA = qw(DXChannel); use DXUtil; use DXM; @@ -19,9 +19,10 @@ use DXDebug; use strict; -use vars qw($sentencelth $pc19_version); +use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot); $sentencelth = 180; +$pc9x_nodupe_first_slot = 1; # # All the PCxx generation routines @@ -378,9 +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); - $ext = 0; # only the first slot has an ext. + $s .= '^' . _encode_pc92_call($_, $ext); + $ext = 0 unless $sort eq 'A'; # only the first slot has an ext. } return $s . '^H99^'; } @@ -392,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); } @@ -401,7 +410,7 @@ sub gen_pc92_with_time # add a local one sub pc92a { - return _gen_pc92('A', 0, @_); + return _gen_pc92('A', 2, @_); } # delete a local one @@ -416,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) . ":$main::me->{build}"; + $s .= "^" . scalar $nref->nodes; + $s .= "^" . scalar $nref->users; + return $s . '^H99^'; +} + # send a 'find' message sub pc92f {