projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Fixed problems with sh/rcmd (talk/ann/log) with a callsign as argument and
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 953d5f2d3eae3fc6abf8cac10c098d41ec9e14d0..4002c82845e6cead2abae81d05fce91cf8e59846 100644
(file)
--- a/
cmd/talk.pl
+++ b/
cmd/talk.pl
@@
-12,6
+12,9
@@
my $to = uc $argv[0];
my $via;
my $from = $self->call();
my $via;
my $from = $self->call();
+# have we a callsign and some text?
+return (1, $self->msg('e8')) if @argv < 2;
+
if ($argv[1] eq '>') {
$via = uc $argv[2];
$line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
if ($argv[1] eq '>') {
$via = uc $argv[2];
$line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
@@
-19,13
+22,19
@@
if ($argv[1] eq '>') {
$line =~ s/^$argv[0]\s*//;
}
$line =~ s/^$argv[0]\s*//;
}
+my $call = $via ? $via : $to;
+my $ref = DXCluster->get($call);
+return (1, "$call not visible on the cluster") if !$ref;
+
my $dxchan = DXCommandmode->get($to); # is it for us?
if ($dxchan && $dxchan->is_user) {
$dxchan->send("$to de $from $line");
my $dxchan = DXCommandmode->get($to); # is it for us?
if ($dxchan && $dxchan->is_user) {
$dxchan->send("$to de $from $line");
+ Log('talk', $to, $from, $main::mycall, $line);
} else {
$line =~ s/\^//og; # remove any ^ characters
} else {
$line =~ s/\^//og; # remove any ^ characters
- my $prot = DXProt::pc10($
self
, $to, $via, $line);
+ my $prot = DXProt::pc10($
from
, $to, $via, $line);
DXProt::route($via?$via:$to, $prot);
DXProt::route($via?$via:$to, $prot);
+ Log('talk', $to, $from, $via?$via:$main::mycall, $line);
}
return (1, ());
}
return (1, ());