X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FAranea.pm;h=52c622b0088b532877d78c9ff6f1a2c0558b8d7b;hb=00a2286d015f9c14bca150de6957057588b4a0f6;hp=c68b211686b72b83bbd7ad18e7f4c82385de003d;hpb=9247dc52598db705b9cf6cbbec16c3919ac5e1d7;p=spider.git diff --git a/perl/Aranea.pm b/perl/Aranea.pm index c68b2116..52c622b0 100644 --- a/perl/Aranea.pm +++ b/perl/Aranea.pm @@ -25,12 +25,11 @@ use Script; use Verify; use DXDupe; use Thingy; +use RouteDB; 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(@ISA $ntpflag $dupeage); @@ -207,6 +206,7 @@ sub genheader my $date = ((($dayno << 1) | $ntpflag) << 18) | ($main::systime % 86400); my $r = "$mycall," . sprintf('%6X%04X,0', $date, $seqno); $r .= ",$to" if $to; + $r .= "," if $from && !$to; $r .= ",$from" if $from; $seqno++; $seqno = 0 if $seqno > 0x0ffff; @@ -325,7 +325,7 @@ sub input $thing->{touser} = $tus if $tus; $thing->{user} = $user if $user; $thing->{hopsaway} = $hop; - + for (split(/,/, $rdata)) { if (/=/) { my ($k,$v) = split /=/, $_, 2;