X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=4f609aaadfd539bd21014c4286e410d64916a043;hb=cee0bfe61e83c87a6ded04034cc57789a0950f9e;hp=2d1fbb9ef27d402c1e441d2731951aa6c9d56a96;hpb=19740220d324a319fb868ce34fb7bed7e31dd450;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 2d1fbb9e..4f609aaa 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -1,5 +1,5 @@
 #
-# The talk command
+# The talk command (improved)
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
@@ -21,7 +21,7 @@ return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 # 4) talk call>node text
 #
 
-($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)\s*>([A-Za-z0-9\-]+)(.*)$/;
+($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)(?:\s*>([A-Za-z0-9\-]+))?\s+(.*)$/;
 if ($via) {
 	$line =~ s/\s+// if $line;
 } else {
@@ -32,49 +32,52 @@ return (1, $self->msg('e8')) unless $to;
 
 $to = uc $to;
 
-return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e22', $to)) unless is_callsign($to);
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
 
 $via = uc $via if $via;
 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;
+#my $clref = Route::get($call);     # try an exact call
+#my $dxchan = $clref->dxchan if $clref;
+#push @out, $self->msg('e7', $call) unless $dxchan;
 
 #$DB::single = 1;
 
 # default the 'via'
-#$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
+my @bad;
+if (@bad = BadWords::check($line)) {
+	$self->badcount(($self->badcount||0) + @bad);
+	LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+}
+
+my $dxchan;
+
 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;
 	$s .= ">$via" if $via && $via ne '*';
 	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'));
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'), undef, $ipaddr);
 	push @out, $self->talk_prompt;
 }