add all the basic aranea routing + local configuration broadcasts

[spider.git] / perl / AMsg.pm

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 6a17832253962408ade247fbae34524bf649633d..15596a98196958e3e2185e0d76cb09ca397f26da 100644 (file)
--- a/perl/AMsg.pm
+++ b/perl/AMsg.pm
@@ -22,10 +22,8 @@ use Thingy;
 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));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(@ISA $deftimeout);
 
@@ -71,7 +69,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{|HELLO,}) {
                                        # a possibly valid HELLO line, process it
                                        $conn->new_channel($msg);
                                }
@@ -127,7 +125,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');