X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAMsg.pm;h=4738403a5bf2d2b1f6aee333ac8709ce3c1208c5;hb=7abfb64b58d106d8352eb365b63cec23669c4e0d;hp=0a26bde217a87e46e23b13da6922dc195efcc3db;hpb=5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d;p=spider.git

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 0a26bde2..4738403a 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{RT,[0-9A-F,]+|HELLO}) {
+				if ($msg =~ m{|HELLO,}) {
 					# a possibly valid HELLO line, process it
 					$conn->new_channel($msg);
 				}
@@ -128,7 +126,6 @@ sub new_client {
 			$conn->{outbound} = 0;
 			$conn->{state} = 'WH';		# wait for return authorize
 			my $thing = $conn->{lastthing} = Thingy::Hello->new();
-
 			$thing->send($conn, 'Aranea');
 			dbg("-> D $conn->{peerhost} $thing->{Aranea}") if isdbg('chan');
 		}
@@ -172,7 +169,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';