package DXCommandmode;
+use POSIX;
+
@ISA = qw(DXChannel);
use DXUtil;
use DXLogPrint;
use DXBearing;
use CmdAlias;
-use FileHandle;
-use Carp;
+use Filter;
+use Minimuf;
+use DXDb;
+use AnnTalk;
+use WCY;
+use Sun;
use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
%Cache = (); # cache of dynamically loaded routine's mod times
%cmd_cache = (); # cache of short names
$errstr = (); # error string from eval
%aliases = (); # aliases for (parts of) commands
+$scriptbase = "$main::root/scripts"; # the place where all users start scripts go
#
# obtain a new connection this is derived from dxchannel
sub new
{
my $self = DXChannel::alloc(@_);
- $self->{'sort'} = 'U'; # in absence of how to find out what sort of an object I am
return $self;
}
$self->state('prompt'); # a bit of room for further expansion, passwords etc
$self->{priv} = $user->priv;
$self->{lang} = $user->lang;
- $self->{pagelth} = 20;
+ $self->{pagelth} = $user->pagelth || 20;
$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
$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->prompt() if $self->{state} =~ /^prompt/o;
+ $self->{beep} = $user->wantbeep;
+ $self->{ann} = $user->wantann;
+ $self->{wwv} = $user->wantwwv;
+ $self->{wcy} = $user->wantwcy;
+ $self->{talk} = $user->wanttalk;
+ $self->{wx} = $user->wantwx;
+ $self->{dx} = $user->wantdx;
+ $self->{logininfo} = $user->wantlogininfo;
+ $self->{here} = 1;
+
# add yourself to the database
my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
my $cuser = DXNodeuser->new($self, $node, $call, 0, 1);
$node->dxchan($self) if $call eq $main::myalias; # send all output for mycall to myalias
-
+
# 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('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));
+ # decide on echo
+ if (!$user->wantecho) {
+ $self->send_now('E', "0");
+ $self->send($self->msg('echow'));
+ }
+
+ $self->tell_login('loginu');
- $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;
$self->send($self->msg('page', scalar @ans));
} else {
for (@ans) {
- s/\s+$//o; # why ?????????
- $self->send($_);
+ $self->send($_) if $_;
}
}
}
dbg('eval', "stored func cmd = $c\n");
eval $c;
if ($@) {
- return (1, "Syserr: Eval err $errstr on stored func $self->{func}");
+ return ("Syserr: Eval err $errstr on stored func $self->{func}", $@);
}
} else {
+
+ return () if length $cmdline == 0;
# strip out //
$cmdline =~ s|//|/|og;
# split the command line up into parts, the first part is the command
- my ($cmd, $args) = $cmdline =~ /^([\S\/]+)\s*(.*)/o;
+ my ($cmd, $args) = split /\s+/, $cmdline, 2;
+ $args = "" unless $args;
if ($cmd) {
# alias it if possible
my $acmd = CmdAlias::get_cmd($cmd);
if ($acmd) {
- ($cmd, $args) = "$acmd $args" =~ /^([\w\/]+)\s*(.*)/o;
+ ($cmd, $args) = split /\s+/, "$acmd $args", 2;
+ $args = "" unless $args;
dbg('command', "aliased cmd: $cmd $args");
}
if ($package) {
dbg('command', "package: $package");
+ my $c;
+ unless (exists $Cache{$package}->{'sub'}) {
+ $c = eval $Cache{$package}->{'eval'};
+ if ($@) {
+ return DXDebug::shortmess($@);
+ }
+ $Cache{$package}->{'sub'} = $c;
+ }
+ $c = $Cache{$package}->{'sub'};
+ eval {
+ @ans = &{$c}($self, $args);
+ };
- my $c = qq{ \@ans = $package(\$self, \$args) };
- dbg('eval', "cluster cmd = $c\n");
- eval $c;
if ($@) {
- @ans = (0, "Syserr: Eval err cached $package\n$@");
- }
+ cluck($@);
+ return (DXDebug::shortmess($@));
+ };
}
} else {
dbg('command', "cmd: $cmd not found");
- @ans = (0);
+ return ($self->msg('e1'));
}
}
}
- if ($ans[0]) {
- shift @ans;
- } else {
- shift @ans;
- if (@ans > 0) {
- unshift @ans, $self->msg('e2');
- } else {
- @ans = $self->msg('e1');
- }
- }
+ shift @ans;
return (@ans);
}
sub finish
{
my $self = shift;
+ my $conn = shift;
my $call = $self->call;
+ # I was the last node visited
+ $self->user->node($main::mycall);
+
# log out text
- if (-e "$main::data/logout") {
+ if ($conn && -e "$main::data/logout") {
open(I, "$main::data/logout") or confess;
my @in = <I>;
close(I);
my $node = DXNode->get($main::mycall);
$node->{dxchan} = 0;
}
- 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);
+
+ # send info to all logged in thingies
+ $self->tell_login('logoutu');
+
Log('DXCommand', "$call disconnected");
+ my $ref = DXCluster->get_exact($call);
$ref->del() if $ref;
}
return @out;
}
+# run a script for this user
+sub run_script
+{
+ my $self = shift;
+ my $silent = shift || 0;
+
+}
+
#
# search for the command in the cache of short->long form commands
#
#Dress it up as a real package name
$string =~ s/\//_/og;
- return "Emb_" . $string;
-}
-
-#borrowed from Safe.pm
-sub delete_package {
- my $pkg = shift;
- my ($stem, $leaf);
-
- no strict 'refs';
- $pkg = "DXCommandmode::$pkg\::"; # expand to full symbol table name
- ($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
-
- if ($stem && $leaf) {
- my $stem_symtab = *{$stem}{HASH};
- delete $stem_symtab->{$leaf};
- }
+ return $string;
}
# find a cmd reference
return undef;
}
- if(defined $Cache{$package}{mtime} && $Cache{$package}{mtime } <= $mtime) {
+ if(defined $Cache{$package}->{mtime} &&$Cache{$package}->{mtime} <= $mtime) {
#we have compiled this subroutine already,
#it has not been updated on disk, nothing left to do
#print STDERR "already compiled $package->handler\n";
;
} else {
- delete_package($package) if defined $Cache{$package}{mtime};
-
- my $fh = new FileHandle;
- if (!open $fh, $filename) {
+
+ my $sub = readfilestr($filename);
+ unless ($sub) {
$errstr = "Syserr: can't open '$filename' $!";
return undef;
};
- local $/ = undef;
- my $sub = <$fh>;
- close $fh;
#wrap the code into a subroutine inside our unique package
- my $eval = qq{ sub $package { $sub } };
+ my $eval = qq( sub { $sub } );
if (isdbg('eval')) {
my @list = split /\n/, $eval;
}
}
- {
- #hide our variables within this block
- my($filename,$mtime,$package,$sub);
- eval $eval;
- }
-
- if ($@) {
- print "\$\@ = $@";
- $errstr = $@;
- delete_package($package);
- } else {
- #cache it unless we're cleaning out each time
- $Cache{$package}{'mtime'} = $mtime;
- }
+ $Cache{$package} = {mtime => $mtime, 'eval' => $eval };
}
-
- #print Devel::Symdump->rnew($package)->as_string, $/;
- $package = "DXCommandmode::$package" if $package;
- $package = undef if $errstr;
+
return $package;
}
projects / spider.git / blobdiff