projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix is_ipaddr? change pc92 A/D default
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 2d1fbb9ef27d402c1e441d2731951aa6c9d56a96..46de76faa68966a26fb84ac33f03da27eb6ee6d9 100644
(file)
--- 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
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
@@
-32,21
+32,22
@@
return (1, $self->msg('e8')) unless $to;
$to = uc $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('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->
is
registered || $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;
$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;
+
push @out, $self->msg('e7', $call
) unless $dxchan;
#$DB::single = 1;
# default the 'via'
#$via ||= '*';
#$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) {
# if there is a line send it, otherwise add this call to the talk list
# and set talk mode for command mode
if ($line) {
@@
-56,7
+57,7
@@
if ($line) {
$self->badcount(($self->badcount||0) + @bad);
LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
} else {
$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;
}
} else {
my $s = $to;
@@
-64,17
+65,17
@@
if ($line) {
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
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 ]);
$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');
}
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;
}
push @out, $self->talk_prompt;
}