X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAranea.pm;h=52c622b0088b532877d78c9ff6f1a2c0558b8d7b;hb=00a2286d015f9c14bca150de6957057588b4a0f6;hp=ecf57055e7924c57f8e6a2ff4581f1c7563051d3;hpb=5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d;p=spider.git

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index ecf57055..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);
 
@@ -205,7 +204,9 @@ sub genheader
 	my $from = shift;
 	
 	my $date = ((($dayno << 1) | $ntpflag) << 18) |  ($main::systime % 86400);
-	my $r = "$mycall,$to," . sprintf('%6X%04X,0', $date, $seqno);
+	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;
@@ -284,16 +285,20 @@ sub input
 	my ($head, $data) = split /\|/, $line, 2;
 	return unless $head && $data;
 
-	my ($origin, $group, $dts, $hop, $user) = split /,/, $head;
+	my ($origin, $dts, $hop, $group, $user) = split /,/, $head;
 	return if DXDupe::check("Ara,$origin,$dts", $dupeage);
 	my $err;
-	$err .= "incomplete header," unless $origin && defined $group && $dts && defined $hop;
+	$err .= "incomplete header," unless $origin && $dts && defined $hop;
 	my ($cmd, $rdata) = split /,/, $data, 2;
 
 	# validate it further
 	$err .= "missing cmd or data," unless $cmd && $data;
 	$err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
-	$err .= "invalid group ($group)," unless $group =~ /^[-A-Z0-9\/:]{2,}$/;
+	my ($gp, $tus) = split /:/, $group, 2 if $group;
+		
+	$err .= "invalid group ($gp)," if $gp && $gp !~ /^[A-Z0-9]{2,}$/;
+	$err .= "invalid tocall ($tus)," if $tus && !is_callsign($tus);
+	$err .= "invalid fromcall ($user)," if $user && !is_callsign($user);
 
 	my $class = 'Thingy::' . ucfirst(lc $cmd);
 	my $thing;
@@ -308,17 +313,19 @@ sub input
 		$thing = $class->new();
 
 		# reconstitute the header but wth hop increased by one
-		$head = join(',', $origin, $group, $dts, ++$hop);
+		$head = join(',', $origin, $dts, ++$hop);
+		$head .= ",$group" if $group;
 		$head .= ",$user" if $user;
 		$thing->{Aranea} = "$head|$data";
 
 		# store useful data
 		$thing->{origin} = $origin;
-		($thing->{group}, $thing->{touser}) = split /:/, $group, 2;
 		$thing->{time} = $t;
+		$thing->{group} = $gp if $gp;
+		$thing->{touser} = $tus if $tus;
 		$thing->{user} = $user if $user;
 		$thing->{hopsaway} = $hop; 
-		
+
 		for (split(/,/, $rdata)) {
 			if (/=/) {
 				my ($k,$v) = split /=/, $_, 2;