X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=2df6b03ac511c4b333021bea6f3ed322174ec4e1;hb=4176dc3ee603f4b13c27d4267f8acbec3bf8f851;hp=03253bf0b2a50827ad7ef88f9a19cc8cf8472119;hpb=5b3f4e20affe90bff9909272a933834247a2ed9d;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 03253bf0..2df6b03a 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -539,7 +539,7 @@ sub normal
 						dbg('chan', "LOOP: $call is a node");
 						next;
 					}
-					my $rcall = $ref->call;
+					my $rcall = $ref->mynode->call;
 					dbg('chan', "LOOP: already have $call on $rcall");
 					next;
 				}
@@ -644,7 +644,8 @@ sub normal
 						dbg('chan', "LOOP: $call come in on wrong channel");
 						next;
 					}
-					dbg('chan', "already have $call");
+					my $rcall = $node->mynode->call;
+					dbg('chan', "already have $call on $rcall");
 					next;
 				}
 				
@@ -896,11 +897,6 @@ sub normal
 		if ($pcno == 41) {		# user info
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($field[1]);
-			if (!$user) {
-				# then try without an SSID
-				$field[1] =~ s/-\d+$//o;
-				$user = DXUser->get_current($field[1]);
-			}
 			$user = DXUser->new($field[1]) if !$user;
 			
 			if ($field[2] == 1) {