package DXCommandmode;
+use POSIX;
+use IO::File;
+
@ISA = qw(DXChannel);
use DXUtil;
use DXM;
use DXLog;
use DXLogPrint;
+use DXBearing;
use CmdAlias;
-use FileHandle;
+use Filter;
use Carp;
+use Minimuf;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases);
sub new
{
my $self = DXChannel::alloc(@_);
- $self->{sort} = 'U'; # in absence of how to find out what sort of an object I am
+ $self->{'sort'} = 'U'; # in absence of how to find out what sort of an object I am
return $self;
}
$self->{consort} = $line; # save the connection type
# set some necessary flags on the user if they are connecting
- $self->{beep} = $self->{wwv} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
+ $self->{beep} = $self->{wwv} = $self->{wx} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
# $self->prompt() if $self->{state} =~ /^prompt/o;
# add yourself to the database
# issue a pc16 to everybody interested
my $nchan = DXChannel->get($main::mycall);
my @pc16 = DXProt::pc16($nchan, $cuser);
- DXProt::broadcast_ak1a(@pc16);
+ for (@pc16) {
+ DXProt::broadcast_all_ak1a($_);
+ }
Log('DXCommand', "$call connected");
# send prompts and things
my $info = DXCluster::cluster();
$self->send("Cluster:$info");
+ $self->send($self->msg('namee1')) if !$user->name;
+ $self->send($self->msg('qthe1')) if !$user->qth;
+ $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
+ $self->send($self->msg('hnodee1')) if !$user->qth;
+ $self->send($self->msg('m9')) if DXMsg::for_me($call);
+
+
$self->send($self->msg('pr', $call));
}
} else {
$self->state('prompt');
}
+ } elsif ($self->{state} eq 'sysop') {
+ my $passwd = $self->{user}->passwd;
+ my @pw = split / */, $passwd;
+ if ($passwd) {
+ my @l = @{$self->{passwd}};
+ my $str = "$pw[$l[0]].*$pw[$l[1]].*$pw[$l[2]].*$pw[$l[3]].*$pw[$l[4]]";
+ if ($cmdline =~ /$str/) {
+ $self->{priv} = $self->{user}->priv;
+ } else {
+ $self->send($self->msg('sorry'));
+ }
+ } else {
+ $self->send($self->msg('sorry'));
+ }
+ delete $self->{passwd};
+ $self->state('prompt');
} else {
- @ans = run_cmd($self, $cmdline) if length $cmdline;
+ @ans = run_cmd($self, $cmdline); # if length $cmdline;
if ($self->{pagelth} && @ans > $self->{pagelth}) {
my $i;
return (1, "Syserr: Eval err $errstr on stored func $self->{func}");
}
} else {
+
+ return () if length $cmdline == 0;
# strip out //
$cmdline =~ s|//|/|og;
($path, $fcmd) = search($main::localcmd, $cmd, "pl");
($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
- dbg('command', "path: $cmd cmd: $fcmd");
+ if ($path && $cmd) {
+ dbg('command', "path: $cmd cmd: $fcmd");
- my $package = find_cmd_name($path, $fcmd);
- @ans = (0) if !$package ;
-
- if ($package) {
- dbg('command', "package: $package");
+ my $package = find_cmd_name($path, $fcmd);
+ @ans = (0) if !$package ;
- my $c = qq{ \@ans = $package(\$self, \$args) };
- dbg('eval', "cluster cmd = $c\n");
- eval $c;
- if ($@) {
- @ans = (0, "Syserr: Eval err cached $package\n$@");
+ if ($package) {
+ dbg('command', "package: $package");
+
+ my $c = qq{ \@ans = $package(\$self, \$args) };
+ dbg('eval', "cluster cmd = $c\n");
+ eval $c;
+ if ($@) {
+ @ans = (0, "Syserr: Eval err cached $package\n$@");
+ }
}
+ } else {
+ dbg('command', "cmd: $cmd not found");
+ @ans = (0);
}
}
}
sub process
{
my $t = time;
- my @chan = DXChannel->get_all();
- my $chan;
+ my @dxchan = DXChannel->get_all();
+ my $dxchan;
- foreach $chan (@chan) {
- next if $chan->sort ne 'U';
+ foreach $dxchan (@dxchan) {
+ next if $dxchan->sort ne 'U';
# send a prompt if no activity out on this channel
- if ($t >= $chan->t + $main::user_interval) {
- $chan->prompt() if $chan->{state} =~ /^prompt/o;
- $chan->t($t);
+ if ($t >= $dxchan->t + $main::user_interval) {
+ $dxchan->prompt() if $dxchan->{state} =~ /^prompt/o;
+ $dxchan->t($t);
}
}
}
{
my $self = shift;
my $call = $self->call;
-
+
+ # log out text
+ if (-e "$main::data/logout") {
+ open(I, "$main::data/logout") or confess;
+ my @in = <I>;
+ close(I);
+ $self->send_now('D', @in);
+ sleep(1);
+ }
+
if ($call eq $main::myalias) { # unset the channel if it is us really
my $node = DXNode->get($main::mycall);
$node->{dxchan} = 0;
}
- my $ref = DXNodeuser->get($call);
+ my $ref = DXCluster->get_exact($call);
# issue a pc17 to everybody interested
my $nchan = DXChannel->get($main::mycall);
my $pc17 = $nchan->pc17($self);
- DXProt::broadcast_ak1a($pc17);
+ DXProt::broadcast_all_ak1a($pc17);
Log('DXCommand', "$call disconnected");
$ref->del() if $ref;
sub prompt
{
my $self = shift;
- my $call = $self->{call};
- $self->send($self->msg('pr', $call));
- #DXChannel::msg($self, 'pr', $call);
+ $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
}
# broadcast a message to all users [except those mentioned after buffer]
my $s = shift; # the line to be rebroadcast
my @except = @_; # to all channels EXCEPT these (dxchannel refs)
my @list = DXChannel->get_all(); # just in case we are called from some funny object
- my ($chan, $except);
+ my ($dxchan, $except);
- L: foreach $chan (@list) {
- next if !$chan->sort eq 'U'; # only interested in user channels
+ L: foreach $dxchan (@list) {
+ next if !$dxchan->sort eq 'U'; # only interested in user channels
foreach $except (@except) {
- next L if $except == $chan; # ignore channels in the 'except' list
+ next L if $except == $dxchan; # ignore channels in the 'except' list
}
- chan->send($s); # send it
+ $dxchan->send($s); # send it
}
}
return () if $short_cmd =~ /\/$/;
# return immediately if we have it
- my ($apath, $acmd) = split ',', $cmd_cache{$short_cmd};
+ ($apath, $acmd) = split ',', $cmd_cache{$short_cmd} if $cmd_cache{$short_cmd};
if ($apath && $acmd) {
dbg('command', "cached $short_cmd = ($apath, $acmd)\n");
return ($apath, $acmd);
pop @lparts; # remove the suffix
$l = join '.', @lparts;
# chop $dirfn; # remove trailing /
+ $dirfn = "" unless $dirfn;
$cmd_cache{"$short_cmd"} = join(',', ($path, "$dirfn$l")); # cache it
dbg('command', "got path: $path cmd: $dirfn$l\n");
return ($path, "$dirfn$l");
# return if we can't find it
$errstr = undef;
- if (undef $mtime) {
+ unless (defined $mtime) {
$errstr = DXM::msg('e1');
return undef;
}
#print STDERR "already compiled $package->handler\n";
;
} else {
- my $fh = new FileHandle;
+ delete_package($package) if defined $Cache{$package}{mtime};
+
+ my $fh = new IO::File;
if (!open $fh, $filename) {
$errstr = "Syserr: can't open '$filename' $!";
return undef;
close $fh;
#wrap the code into a subroutine inside our unique package
- my $eval = qq{
- sub $package
- {
- $sub
- } };
+ my $eval = qq{ sub $package { $sub } };
if (isdbg('eval')) {
my @list = split /\n/, $eval;
delete_package($package);
} else {
#cache it unless we're cleaning out each time
- $Cache{$package}{mtime} = $mtime;
+ $Cache{$package}{'mtime'} = $mtime;
}
}
projects / spider.git / blobdiff