X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=46de76faa68966a26fb84ac33f03da27eb6ee6d9;hb=5b8c14dd8ac82a211bc1bfbcefee7e7820a812a1;hp=4673392a0ca345fba3d28399b0b75982e2e691eb;hpb=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 4673392a..46de76fa 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -1,9 +1,9 @@
 #
-# The talk command
+# The talk command (improved)
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $inline) = @_;
@@ -28,28 +28,36 @@ if ($via) {
 	($to, $line) = split /\s+/, $inline, 2;  
 }
 
-$to = uc $to if $to;
+return (1, $self->msg('e8')) unless $to;
+
+$to = uc $to;
+
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
+
 $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;
+push @out, $self->msg('e7', $call) unless $dxchan;
 
-$DB::single = 1;
+#$DB::single = 1;
 
 # default the 'via'
 #$via ||= '*';
 
+my $ipaddr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1');
+
 # if there is a line send it, otherwise add this call to the talk list
 # 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) . ")");
 	} else {
-		$main::me->normal(DXProt::pc93($to, $self->call, $via, $line));
+		$main::me->normal(DXProt::pc93($to, $self->call, $via, $line, undef, $ipaddr));
 	}
 } else {
 	my $s = $to;
@@ -57,16 +65,17 @@ if ($line) {
 	my $ref = $self->talklist;
 	if ($ref) {
 		unless (grep { $_ eq $s } @$ref) {
-			$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+			$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart'), undef,  $ipaddr));
 			$self->state('talk');
 			push @$ref, $s;
 		}
 	} else { 
 		$self->talklist([ $s ]);
-		$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+		$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart'), undef, $ipaddr));
 		push @out, $self->msg('talkinst');
 		$self->state('talk');
 	}
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'), undef, $ipaddr);
 	push @out, $self->talk_prompt;
 }