added some more pc16/17 routing code

[spider.git] / perl / Aranea.pm

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index 3af3aee9432cd934f21f992cbd3006b3f36867a4..fc77cc13122fe6f1a7f330c11992e5aedb1ac59f 100644 (file)
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -25,10 +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));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -55,7 +56,7 @@ sub new
        # add this node to the table, the values get filled in later
        my $pkg = shift;
        my $call = shift;
-       $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
+       $main::routeroot->add($call, '5251', Route::here(1)) if $call ne $main::mycall;
        $self->{'sort'} = 'W';
        return $self;
 }
@@ -205,7 +206,8 @@ 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 .= ",$from" if $from;
        $seqno++;
        $seqno = 0 if $seqno > 0x0ffff;
@@ -284,16 +286,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 +314,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;