X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=ebde8888ebd106101c082af5afff612489a218d7;hb=324bd80ed4aef7e2636f5a03288788ce11ab2663;hp=5b8cdaeedf137f7139628c6f81a03344946a1c3b;hpb=2546ef0cfaaca39e65985e414258071a636979af;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 5b8cdaee..ebde8888 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -1,34 +1,55 @@
 #
 # The talk command
 #
+# Copyright (c) 1998 Dirk Koopman G1TLH
+#
 # $Id$
 #
 
 my ($self, $line) = @_;
-my @argv = split /\s+/, $line;		      # generate an argv
+my @argv = split /\s+/, $line;	# generate an argv
 my $to = uc $argv[0];
 my $via;
 my $from = $self->call();
+my @out;
+
+# have we a callsign and some text?
+return (1, $self->msg('e8')) if @argv < 2;
 
 if ($argv[1] eq '>') {
-  $via = uc $argv[2];
-#  print "argv[0] $argv[0] argv[2] $argv[2]\n";
-  $line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//o;
+	$via = uc $argv[2];
+	$line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
 } else {
-#  print "argv[0] $argv[0]\n";
-  $line =~ s/^$argv[0]\s*//o;
+	$line =~ s/^$argv[0]\s*//;
 }
 
-#print "to=$to via=$via line=$line\n";
-my $dxchan = DXCommandmode->get($to);         # is it for us?
+my $call = $via ? $via : $to;
+my $ref = DXCluster->get($call);
+
+# if we haven't got an explicit via and we can't see them, try their node
+unless ($ref || $via) {
+	my $user = DXUser->get($call);
+	$ref = DXCluster->get_exact($user->node);
+	if ($ref) {
+		$via = $user->node;
+		push @out, "trying via $via..";
+	}
+}
+return (1, "$call not visible on the cluster") if !$ref;
+
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
+my $dxchan = DXCommandmode->get($to); # is it for us?
 if ($dxchan && $dxchan->is_user) {
-  $dxchan->send("$to de $from $line");
+	$dxchan->send("$to de $from $line") if $dxchan->talk;
+	Log('talk', $to, $from, $main::mycall, $line);
 } else {
-  my $prot = DXProt::pc10($self, $to, $via, $line);
-#  print "prot=$prot\n";
-
-  DXProt::route($via?$via:$to, $prot);
+	$line =~ s/\^//og;			# remove any ^ characters
+	my $prot = DXProt::pc10($from, $to, $via, $line);
+	DXProt::route($via?$via:$to, $prot);
+	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
 }
 
-return (1, ());
+return (1, @out);