started port of routing stuff

[spider.git] / perl / AMsg.pm

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 6a17832253962408ade247fbae34524bf649633d..0a26bde217a87e46e23b13da6922dc195efcc3db 100644 (file)
--- a/perl/AMsg.pm
+++ b/perl/AMsg.pm
@@ -23,7 +23,7 @@ use Thingy::Hello;
 
 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;
 
@@ -71,7 +71,7 @@ sub dequeue
                                # this is the first stage that we have a callsign
                                # do we have a hello?
                                $msg =~ s/[\r\n]+$//;
-                               if ($msg =~ m{ROUTE,[0-9A-F,]+|HELLO}) {
+                               if ($msg =~ m{RT,[0-9A-F,]+|HELLO}) {
                                        # a possibly valid HELLO line, process it
                                        $conn->new_channel($msg);
                                }
@@ -127,7 +127,7 @@ sub new_client {
                        Log('Aranea', "Incoming connection from $conn->{peerhost}");
                        $conn->{outbound} = 0;
                        $conn->{state} = 'WH';          # wait for return authorize
-                       my $thing = $conn->{lastthing} = Thingy::Hello->new(origin=>$main::mycall, group=>'ROUTE');
+                       my $thing = $conn->{lastthing} = Thingy::Hello->new();
 
                        $thing->send($conn, 'Aranea');
                        dbg("-> D $conn->{peerhost} $thing->{Aranea}") if isdbg('chan');