X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=72595d8a0423ebeebeff7981fbb4cb942cb1d8b3;hb=ed6790555f077eb521b8805113155a2ff99cc47e;hp=180ce526ef17357c67d474bc45c34b9994e0b368;hpb=22df46c61d3f1ae4115224bcc230ffe7ed6aff99;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 180ce526..72595d8a 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -28,7 +28,7 @@ $main::branch += $BRANCH; use vars qw($sentencelth); $sentencelth = 180; - + # # All the PCxx generation routines # @@ -66,14 +66,15 @@ sub pc11 # create an announce message sub pc12 { - my ($call, $text, $tonode, $sysop, $wx) = @_; + my ($call, $text, $tonode, $sysop, $wx, $origin) = @_; my $hops = get_hops(12); - $sysop = ' ' if !$sysop; - $text = ' ' if !$text; - $wx = '0' if !$wx; - $tonode = '*' if !$tonode; + $text ||= ' '; $text =~ s/\^/%5E/g; - return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~"; + $tonode ||= '*'; + $sysop ||= ' '; + $wx ||= '0'; + $origin ||= $main::mycall; + return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~"; } # @@ -122,7 +123,9 @@ sub pc17 # Request init string sub pc18 { - return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^"; + my $flags = " pc92"; + $flags .= " xml" if DXXml::available(); + return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^"; } # @@ -371,9 +374,51 @@ sub pc85 return "PC85^$tonode^$fromnode^$call^$msg^~"; } -# spider route broadcast -sub pc90 +# spider route broadcasts +# + +my $_last_time; +my $_last_occurs; + +sub _gen_time +{ + if (!$_last_time || $_last_time != $main::systime) { + $_last_time = $main::systime; + $_last_occurs = 0; + return $_last_time; + } else { + $_last_occurs++; + return sprintf "$_last_time.%02d", $_last_occurs; + } +} + +sub _gen_pc92 +{ + my $sort = shift; + my $ext = $sort eq 'C'; + my $s = "PC92^" . _encode_pc92_call($main::me, $ext) . "^" . _gen_time . "^$sort"; + for (@_) { + $s .= "^" . _encode_pc92_call($_, $ext); + } + return $s . '^H99^'; +} + +# add a local one +sub pc92a +{ + return _gen_pc92('A', @_); +} + +# delete a local one +sub pc92d +{ + return _gen_pc92('D', @_); +} + +# send a config +sub pc92c { + return _gen_pc92('C', @_); } 1;