X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=80b1a5d6eeb916b94fd45bfc1f215bedd627746c;hb=5c15f6e5521944f56427ef069f449739ce84ce9f;hp=cacf60e0c756a67612452ab192bb07c50be157c6;hpb=7ccae7dc99f806c3a0b128a0cf26cf8e489048fb;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index cacf60e0..80b1a5d6 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -21,7 +21,7 @@ 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; +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -210,7 +210,7 @@ sub pc28 sub pc29 { my ($fromnode, $tonode, $stream, $text) = @_; - $text = ' ' unless $text && length $text > 0; + $text = ' ' unless defined $text && length $text > 0; $text =~ s/\^/%5E/og; # remove ^ return "PC29^$fromnode^$tonode^$stream^$text^~"; } @@ -363,32 +363,6 @@ sub pc85 # spider route broadcast sub pc90 { - my $node = shift; - my $sort = shift; - my @out; - my $dxchan; - my $n = @_; - - while (@_) { - my $str = sprintf "PC90^%s^%X^%s%d", $node->call, $main::systime, $sort, $n-1 ; - for (; @_ && length $str < 200;) { - my $ref = shift; - next if $ref == $main::me; - my $call = $ref->call; - my $flag = 0; - $flag += 1 if $ref->here; - $flag += 2 if $ref->conf; - if ($ref->is_node) { - my $ping = int($ref->pingave * 10); - $str .= "^N$flag$call,$ping"; - } else { - $str .= "^U$flag$call"; - } - } - $str .= sprintf "^%s^", get_hops(90); - push @out, $str; - } - return @out; } 1;