X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=46de76faa68966a26fb84ac33f03da27eb6ee6d9;hb=eba7370bb0458ae84b4815f30494a7c389008d0e;hp=dae38e243be0d56b8f1378fd57e8f4bcf067e28b;hpb=ef77e5488c4cc47afe272f6220cc3fa0cddc5829;p=spider.git diff --git a/cmd/talk.pl b/cmd/talk.pl index dae38e24..46de76fa 100644 --- a/cmd/talk.pl +++ b/cmd/talk.pl @@ -46,6 +46,8 @@ push @out, $self->msg('e7', $call) unless $dxchan; # 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) { @@ -55,7 +57,7 @@ if ($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; @@ -63,17 +65,17 @@ if ($line) { 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; }