X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAMsg.pm;h=4ca43cb495951433f88cf4e325f548e9d3d7e037;hb=c4a169b536b6189937c6e789010c370ff3f2259e;hp=6a17832253962408ade247fbae34524bf649633d;hpb=5b3c2c5e342c23fbab96b7573c5963344617878f;p=spider.git

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 6a178322..4ca43cb4 100644
--- 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');
@@ -172,7 +170,7 @@ sub new_channel
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
 	my $user = DXUser->get_current($call);
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		if ($main::bumpexisting && $call ne $main::mycall) {
 			my $ip = $conn->{peerhost} || 'unknown';