Merge branch 'test' into mojo

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index ebd762ff1630e55d5df003657db69270fc2fb87a..e924acbde41bb95a5ed3ea7aa1106006034d2600 100644 (file)
--- 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) = @_;
@@ -17,58 +17,69 @@ return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 # analyse the line there are four situations...
 # 1) talk call
 # 2) talk call <text>
-# 3) talk call>node 
-# 4) talk call>node text
+# 3) talk call>node  **via ignored
+# 4) talk call>node text **ditto
 #
 
-($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)\s*>([A-Za-z0-9\-]+)(.*)$/;
-if ($via) {
-       $line =~ s/\s+// if $line;
-} else {
-       ($to, $line) = split /\s+/, $inline, 2;  
-}
+# via is deprecated / ignored
+$inline =~ s/(?:\s*>([A-Za-z0-9\-]+))\s*//;
 
-$to = uc $to if $to;
-$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;
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+($to, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)\s*(.*)?$/;
+
+#$DB::single = 1;
+
+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 || $to;
+#my $clref = Route::get($call);     # try an exact call
+#my $dxchan = $clref->dxchan if $clref;
+#push @out, $self->msg('e7', $call) unless $dxchan;
+
+my $call = $to;
 
 #$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));
+       $self->send_talks($to, $line);
 } 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;
 }