X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=d035f7ae605a0faeb77af87b5534ee3f1eada2b5;hb=e2e4dadc448747744dacc0eb8d99ee950529a9b3;hp=b31eacdfe111942ded8607bc9759d85e1179a56c;hpb=f47bc72134852f42fe03ab6afe91a9ba1b0ff705;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index b31eacdf..d035f7ae 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -20,10 +20,8 @@ use DXDebug; use strict; use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; + +main::mkver($VERSION = q$Revision$); use vars qw($sentencelth); @@ -68,12 +66,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^~"; } @@ -109,8 +107,8 @@ sub pc16 sub pc17 { my @out; + my $node = shift; while (@_) { - my $node = shift; my $ref = shift; my $hops = get_hops(17); my $ncall = $node->call; @@ -123,7 +121,8 @@ sub pc17 # Request init string sub pc18 { - return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^"; + my $v = $DXProt::myprot_version + $main::version; + return "PC18^DXSpider Version: $main::version Build: $main::build^$v^"; } # @@ -142,6 +141,8 @@ sub pc19 my $here = $ref->here; my $conf = $ref->conf; my $version = $ref->version; + $version = 5300 + int($version*100) if $version < 2; + $version = 5252 + int($version*100) if $version < 3; my $str = "^$here^$call^$conf^$version"; if (length($s) + length($str) > $sentencelth) { push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);