projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix them differently
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 4ec31dee57721f0c4f83db9d632fe0487bdead9f..0a42e510852834fede44e4417b7904dcfb45de0a 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-4,7
+4,7
@@
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXCommandmode;
#
package DXCommandmode;
@@
-54,12
+54,6
@@
$cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
# this does not exist as default, you need to create it manually
#
# this does not exist as default, you need to create it manually
#
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
#
# obtain a new connection this is derived from dxchannel
#
#
# obtain a new connection this is derived from dxchannel
#
@@
-71,11
+65,15
@@
sub new
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
- my @rout = $main::routeroot->add_user($call, Route::here(1));
+# my @rout = $main::routeroot->add_user($call, Route::here(1));
+ DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1]);
# ALWAYS output the user
my $ref = Route::User::get($call);
# ALWAYS output the user
my $ref = Route::User::get($call);
- $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
+ if ($ref) {
+ $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref);
+ $main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes;
+ }
return $self;
}
return $self;
}
@@
-145,6
+143,13
@@
sub start
}
$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
$motd = $main::motd unless $motd && -e $motd;
}
$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
$motd = $main::motd unless $motd && -e $motd;
+ if ($self->conn->{csort} eq 'ax25') {
+ if ($motd) {
+ $motd = "${motd}_ax25" if -e "${motd}_ax25";
+ } else {
+ $motd = "${main::motd}_ax25" if -e "${main::motd}_ax25";
+ }
+ }
$self->send_file($motd) if -e $motd;
# sort out privilege reduction
$self->send_file($motd) if -e $motd;
# sort out privilege reduction
@@
-305,10
+310,14
@@
sub normal
$self->conn->{echo} = $self->conn->{decho};
delete $self->conn->{decho};
$self->state('prompt');
$self->conn->{echo} = $self->conn->{decho};
delete $self->conn->{decho};
$self->state('prompt');
- } elsif ($self->{state} eq 'talk') {
+ } elsif ($self->{state} eq 'talk'
|| $self->{state} eq 'chat'
) {
if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
for (@{$self->{talklist}}) {
if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
for (@{$self->{talklist}}) {
- $self->send_talks($_, $self->msg('talkend'));
+ if ($self->{state} eq 'talk') {
+ $self->send_talks($_, $self->msg('talkend'));
+ } else {
+ $self->local_send('C', $self->msg('chatend', $_));
+ }
}
$self->state('prompt');
delete $self->{talklist};
}
$self->state('prompt');
delete $self->{talklist};
@@
-325,12
+334,16
@@
sub normal
LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
- $self->send_talks($_, $l);
+ if ($self->{state} eq 'talk') {
+ $self->send_talks($_, $l);
+ } else {
+ send_chats($self, $_, $l)
+ }
}
}
}
}
}
}
}
}
- $self->send($self->
talk
_prompt);
+ $self->send($self->
{state} eq 'talk' ? $self->talk_prompt : $self->chat
_prompt);
} elsif ($self->{talklist} && @{$self->{talklist}}) {
# send what has been said to whoever is in this person's talk list
my @bad;
} elsif ($self->{talklist} && @{$self->{talklist}}) {
# send what has been said to whoever is in this person's talk list
my @bad;
@@
-339,10
+352,15
@@
sub normal
LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
- $self->send_talks($_, $rawline);
+ if ($self->{state} eq 'talk') {
+ $self->send_talks($_, $rawline);
+ } else {
+ send_chats($self, $_, $rawline);
+ }
}
}
$self->send($self->talk_prompt) if $self->{state} eq 'talk';
}
}
$self->send($self->talk_prompt) if $self->{state} eq 'talk';
+ $self->send($self->chat_prompt) if $self->{state} eq 'chat';
} else {
# for safety
$self->state('prompt');
} else {
# for safety
$self->state('prompt');
@@
-384,11
+402,11
@@
sub send_talks
my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
$to = $ent unless $to;
my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
$to = $ent unless $to;
- my $call = $via ? $via : $to;
+ my $call = $via
&& $via ne '*'
? $via : $to;
my $clref = Route::get($call);
my $dxchan = $clref->dxchan if $clref;
if ($dxchan) {
my $clref = Route::get($call);
my $dxchan = $clref->dxchan if $clref;
if ($dxchan) {
- $dxchan->talk($self->{call}, $to,
$via
, $line);
+ $dxchan->talk($self->{call}, $to,
undef
, $line);
} else {
$self->send($self->msg('disc2', $via ? $via : $to));
my @l = grep { $_ ne $ent } @{$self->{talklist}};
} else {
$self->send($self->msg('disc2', $via ? $via : $to));
my @l = grep { $_ ne $ent } @{$self->{talklist}};
@@
-401,16
+419,40
@@
sub send_talks
}
}
}
}
-sub
talk_prompt
+sub
send_chats
{
my $self = shift;
{
my $self = shift;
+ my $target = shift;
+ my $text = shift;
+
+ my $msgid = DXProt::nextchatmsgid();
+ $text = "#$msgid $text";
+ $main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text));
+}
+
+sub special_prompt
+{
+ my $self = shift;
+ my $prompt = shift;
my @call;
for (@{$self->{talklist}}) {
my ($to, $via) = /(\S+)>(\S+)/;
$to = $_ unless $to;
push @call, $to;
}
my @call;
for (@{$self->{talklist}}) {
my ($to, $via) = /(\S+)>(\S+)/;
$to = $_ unless $to;
push @call, $to;
}
- return $self->msg('talkprompt', join(',', @call));
+ return $self->msg($prompt, join(',', @call));
+}
+
+sub talk_prompt
+{
+ my $self = shift;
+ return $self->special_prompt('talkprompt');
+}
+
+sub chat_prompt
+{
+ my $self = shift;
+ return $self->special_prompt('chatprompt');
}
#
}
#
@@
-442,6
+484,20
@@
sub send_ans
}
}
}
}
}
}
+
+sub _error_out
+{
+ my $self = shift;
+ my $e = shift;
+ if (++$self->{errors} > $maxerrors) {
+ $self->send($self->msg('e26'));
+ $self->disconnect;
+ return ();
+ } else {
+ return ($self->msg($e));
+ }
+}
+
#
# this is the thing that runs the command, it is done like this for the
# benefit of remote command execution
#
# this is the thing that runs the command, it is done like this for the
# benefit of remote command execution
@@
-455,19
+511,22
@@
sub run_cmd
my $cmdline = shift;
my @ans;
my $cmdline = shift;
my @ans;
-
return () if length $cmdline == 0;
return () if length $cmdline == 0;
-
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
$args = "" unless defined $args;
if ($cmd) {
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
$args = "" unless defined $args;
if ($cmd) {
+
+ # check cmd
+ if ($cmd =~ m|^/| || $cmd =~ m|[^-?\w/]|) {
+ LogDbg('DXCommand', "cmd: invalid characters in '$cmd'");
+ return $self->_error_out('e1');
+ }
+
# strip out // on command only
$cmd =~ s|//|/|g;
# strip out // on command only
$cmd =~ s|//|/|g;
- $cmd =~ s|^/||g; # no leading / either
- $cmd =~ s|[^-?\w/]||g; # and no funny characters either
my ($path, $fcmd);
my ($path, $fcmd);
@@
-478,7
+537,7
@@
sub run_cmd
if ($acmd) {
($cmd, $args) = split /\s+/, "$acmd $args", 2;
$args = "" unless defined $args;
if ($acmd) {
($cmd, $args) = split /\s+/, "$acmd $args", 2;
$args = "" unless defined $args;
- dbg("
aliased cmd:
$cmd $args") if isdbg('command');
+ dbg("
cmd: aliased
$cmd $args") if isdbg('command');
}
# first expand out the entry to a command
}
# first expand out the entry to a command
@@
-486,26
+545,23
@@
sub run_cmd
($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
if ($path && $cmd) {
($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
if ($path && $cmd) {
- dbg("
path:
$cmd cmd: $fcmd") if isdbg('command');
+ dbg("
cmd: path
$cmd cmd: $fcmd") if isdbg('command');
my $package = find_cmd_name($path, $fcmd);
return ($@) if $@;
my $package = find_cmd_name($path, $fcmd);
return ($@) if $@;
- if ($package) {
+ if ($package
&& DXCommandmode->can($package)
) {
no strict 'refs';
no strict 'refs';
- dbg("
package:
$package") if isdbg('command');
+ dbg("
cmd: package
$package") if isdbg('command');
eval { @ans = &$package($self, $args) };
return (DXDebug::shortmess($@)) if $@;
eval { @ans = &$package($self, $args) };
return (DXDebug::shortmess($@)) if $@;
+ } else {
+ dbg("cmd: $package not present") if isdbg('command');
+ return $self->_error_out('e1');
}
} else {
dbg("cmd: $cmd not found") if isdbg('command');
}
} else {
dbg("cmd: $cmd not found") if isdbg('command');
- if (++$self->{errors} > $maxerrors) {
- $self->send($self->msg('e26'));
- $self->disconnect;
- return ();
- } else {
- return ($self->msg('e1'));
- }
+ return $self->_error_out('e1');
}
}
}
}
@@
-572,11
+628,14
@@
sub disconnect
my $uref = Route::User::get($call);
my @rout;
if ($uref) {
my $uref = Route::User::get($call);
my @rout;
if ($uref) {
- @rout = $main::routeroot->del_user($uref);
+# @rout = $main::routeroot->del_user($uref);
+ @rout = DXProt::_del_thingy($main::routeroot, [$call, 0]);
+
dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
# issue a pc17 to everybody interested
$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
# issue a pc17 to everybody interested
$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+ $main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes;
} else {
confess "trying to disconnect a non existant user $call";
}
} else {
confess "trying to disconnect a non existant user $call";
}
@@
-786,14
+845,15
@@
sub find_cmd_name {
no strict 'refs';
if (exists $Cache{$package}) {
no strict 'refs';
if (exists $Cache{$package}) {
- dbg("Redefining $package") if isdbg('command');
+ dbg("
find_cmd_name:
Redefining $package") if isdbg('command');
undef *$package;
} else {
undef *$package;
} else {
- dbg("Defining $package") if isdbg('command');
+ dbg("
find_cmd_name:
Defining $package") if isdbg('command');
}
}
+
eval $eval;
eval $eval;
-
- $Cache{$package} = {mtime => $mtime };
+
+ $Cache{$package} = {mtime => $mtime }
unless $@
;
}
}
@@
-815,7
+875,7
@@
sub send
sub local_send
{
my ($self, $let, $buf) = @_;
sub local_send
{
my ($self, $let, $buf) = @_;
- if ($self->{state} eq 'prompt' || $self->{state} eq 'talk') {
+ if ($self->{state} eq 'prompt' || $self->{state} eq 'talk'
|| $self->{state} eq 'chat'
) {
if ($self->{enhanced}) {
$self->send_later($let, $buf);
} else {
if ($self->{enhanced}) {
$self->send_later($let, $buf);
} else {
@@
-829,7
+889,7
@@
sub local_send
# send a talk message here
sub talk
{
# send a talk message here
sub talk
{
- my ($self, $from, $to, $via, $line) = @_;
+ my ($self, $from, $to, $via, $line
, $onode
) = @_;
$line =~ s/\\5E/\^/g;
if ($self->{talk}) {
if ($self->{gtk}) {
$line =~ s/\\5E/\^/g;
if ($self->{talk}) {
if ($self->{gtk}) {
@@
-838,7
+898,7
@@
sub talk
$self->local_send('T', "$to de $from: $line");
}
}
$self->local_send('T', "$to de $from: $line");
}
}
- Log('talk', $to, $from,
$via?$via:$main::mycall
, $line);
+ Log('talk', $to, $from,
'<' . ($onode || '*')
, $line);
# send a 'not here' message if required
unless ($self->{here} && $from ne $to) {
my $key = "$to$from";
# send a 'not here' message if required
unless ($self->{here} && $from ne $to) {
my $key = "$to$from";
@@
-922,9
+982,9
@@
sub format_dx_spot
my $t = ztime($_[2]);
my $loc = '';
my $clth = $self->{consort} eq 'local' ? 29 : 30;
my $t = ztime($_[2]);
my $loc = '';
my $clth = $self->{consort} eq 'local' ? 29 : 30;
- my $comment = substr
$_[3], 0, $clth;
+ my $comment = substr
(($_[3] || ''), 0, $clth);
$comment .= ' ' x ($clth - length($comment));
$comment .= ' ' x ($clth - length($comment));
- if ($self->{user}->wantgrid) {
+ if ($self->{user}->wantgrid) {
my $ref = DXUser->get_current($_[4]);
if ($ref) {
$loc = $ref->qra || '';
my $ref = DXUser->get_current($_[4]);
if ($ref) {
$loc = $ref->qra || '';
@@
-1050,9
+1110,9
@@
sub broadcast_debug
foreach my $dxchan (DXChannel::get_all) {
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
if ($dxchan->{gtk}) {
foreach my $dxchan (DXChannel::get_all) {
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
if ($dxchan->{gtk}) {
- $dxchan->
local_send
('L', dd(['db', $s]));
+ $dxchan->
send_later
('L', dd(['db', $s]));
} else {
} else {
- $dxchan->
local_send
('L', $s);
+ $dxchan->
send_later
('L', $s);
}
}
}
}
}
}
@@
-1173,5
+1233,12
@@
sub import_cmd
}
}
}
}
}
}
+
+sub print_find_reply
+{
+ my ($self, $node, $target, $flag, $ms) = @_;
+ my $sort = $flag == 2 ? "External" : "Local";
+ $self->send("$sort $target found at $node in $ms ms" );
+}
1;
__END__
1;
__END__