Change buddy message.

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 76b9d25d4dee47029d20211d82f1664adca88e94..143b71e48e4a98c0ff141479aa76f1b73efb96a9 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -333,7 +333,7 @@ sub normal
 {
        my ($self, $line) = @_;
 
-       if ($line =~ '^<\w+\s') {
+       if ($line =~ '^<\w+\s' && $main::do_xml) {
                DXXml::normal($self, $line);
                return;
        }
@@ -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', $call, $ncall);
                                
                # 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', $ucall, $ncall);
 
        if (eph_dup($line)) {
                dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');