X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProtout.pm;h=856a60bb7ad081f0a48de49798f5b39f8c5890d6;hb=dab9e3607e7a6592fc3e316cc83ab17fcd09cb61;hp=b31eacdfe111942ded8607bc9759d85e1179a56c;hpb=f47bc72134852f42fe03ab6afe91a9ba1b0ff705;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index b31eacdf..856a60bb 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 # @@ -68,12 +68,12 @@ sub pc12 { my ($call, $text, $tonode, $sysop, $wx, $origin) = @_; my $hops = get_hops(12); - $origin ||= $main::mycall; - $sysop ||= ' '; $text ||= ' '; - $wx ||= '0'; - $tonode ||= '*'; $text =~ s/\^/%5E/g; + $tonode ||= '*'; + $sysop ||= ' '; + $wx ||= '0'; + $origin ||= $main::mycall; return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~"; } @@ -123,7 +123,9 @@ sub pc17 # Request init string sub pc18 { - return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^"; + my $flags = " pc"; + $flags .= " xml" if DXXml::available(); + return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^"; } # @@ -372,9 +374,64 @@ 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 "$_last_time:$_last_occurs"; + } +} + +sub _gen_pc92 +{ + my $sort = shift; + my $s = "PC92^$sort^" . _gen_time; + for (@_) { + my $flag = 0; + my $call = $_->call; + my $extra = ''; + if ($_->isa('Route::Node')) { + $flag = 4; + if ($call ne $main::mycall && DXChannel::get($call)) { + $flag += 2; + } + if ($sort eq 'C') { + $extra .= ':' . ($_->version || '') if $_->build; + $extra .= ':' . $_->build if $_->build; + } + } + $flag += $_->here ? 1 : 0; + $s .= "^$flag$call$extra"; + } + 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;