From: minima <minima>
Date: Tue, 7 Mar 2006 18:21:42 +0000 (+0000)
Subject: add node to call in tell_login and tell_buddies.
X-Git-Url: http://dxspider.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e725f59f7468216776ffa8a4c72acdd3d7cea101;p=spider.git

add node to call in tell_login and tell_buddies.
---

diff --git a/Changes b/Changes
index ee9fc831..b6e0c628 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+07Mar06=======================================================================
+1. Add the node call to remote tell_login and tell_buddie calls.
 06Mar06=======================================================================
 1. Fix warning on empty PC19s.
 2. Add new command set/local_node to allow people to see logins/outs on other
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 9812037f..45e8d39b 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -523,7 +523,7 @@ sub tell_buddies
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $self;
 		next if $dxchan->{call} eq $main::mycall;
-		$dxchan->send($dxchan->msg($m, $call)) if grep $_ eq $call, @{$dxchan->user->buddies} ;
+		$dxchan->send($dxchan->msg($m, $call)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
 	}
 }
 
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 76b9d25d..8a672744 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -846,8 +846,8 @@ sub handle_16
 		}
 		
 		# send info to all logged in thingies
-		$self->tell_login('loginu', $call) if DXUser->get_current($ncall)->is_local_node;
-		$self->tell_buddies('loginb', $call);
+		$self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node;
+		$self->tell_buddies('loginb', "$ncall: $call");
 				
 		# add this station to the user database, if required
 #		$call =~ s/-\d+$//o;	# remove ssid for users
@@ -920,8 +920,8 @@ sub handle_17
 	}
 
 	# send info to all logged in thingies
-	$self->tell_login('logoutu', $ucall) if DXUser->get_current($ncall)->is_local_node;
-	$self->tell_buddies('logoutb', $ucall);
+	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
+	$self->tell_buddies('logoutb', "$ncall: $ucall");
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');