From: Dirk Koopman <djk@tobit.co.uk>
Date: Sat, 16 Jun 2007 16:10:00 +0000 (+0100)
Subject: improve talk logging to show orig or dest node.
X-Git-Tag: 1.55~160^2~7
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=5a6b7405140f17a0bc6cf5e7bb3d85a02f1eae88;p=spider.git

improve talk logging to show orig or dest node.
---

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 4673392a..ebd762ff 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -30,13 +30,13 @@ if ($via) {
 
 $to = uc $to if $to;
 $via = uc $via if $via;
-my $call = $via ? $via : $to;
+my $call = $via || $to;
 my $clref = Route::get($call);     # try an exact call
 my $dxchan = $clref->dxchan if $clref;
 #return (1, $self->msg('e7', $call)) unless $dxchan;
 return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
 
-$DB::single = 1;
+#$DB::single = 1;
 
 # default the 'via'
 #$via ||= '*';
@@ -45,6 +45,7 @@ $DB::single = 1;
 # and set talk mode for command mode
 if ($line) {
 	my @bad;
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $line);
 	if (@bad = BadWords::check($line)) {
 		$self->badcount(($self->badcount||0) + @bad);
 		LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
@@ -67,6 +68,7 @@ if ($line) {
 		push @out, $self->msg('talkinst');
 		$self->state('talk');
 	}
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
 	push @out, $self->talk_prompt;
 }
 
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index f2899786..94c83634 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -827,7 +827,7 @@ sub local_send
 # send a talk message here
 sub talk
 {
-	my ($self, $from, $to, $via, $line) = @_;
+	my ($self, $from, $to, $via, $line, $onode) = @_;
 	$line =~ s/\\5E/\^/g;
 	if ($self->{talk}) {
 		if ($self->{gtk}) {
@@ -836,7 +836,7 @@ sub talk
 			$self->local_send('T', "$to de $from: $line");
 		}
 	}
-	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
 	# send a 'not here' message if required
 	unless ($self->{here} && $from ne $to) {
 		my $key = "$to$from";
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 0cf46bb9..90ac30f0 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1170,7 +1170,7 @@ sub talk
 	} else {
 		$self->send(pc10($from, $to, $via, $line, $origin));
 	}
-	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
+	Log('talk', $to, $from, '>' . ($via || $origin || $self->call), $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
diff --git a/perl/Version.pm b/perl/Version.pm
index 3c632985..4bb4e0c9 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -10,6 +10,6 @@ package main;
 use vars qw($version $build);
 
 $version = '1.54';
-$build = '39';
+$build = '40';
 
 1;