fiddle about with 'bye'
[spider.git] / perl / DXCommandmode.pm
index ddfefc6e082af843a86e5e14e188400bb761ab43..c03885526a9ed96664d31f75e31a7995eac48bf8 100644 (file)
@@ -9,6 +9,8 @@
 
 package DXCommandmode;
 
+use POSIX;
+
 @ISA = qw(DXChannel);
 
 use DXUtil;
@@ -17,13 +19,37 @@ use DXUser;
 use DXVars;
 use DXDebug;
 use DXM;
-use Carp;
+use DXLog;
+use DXLogPrint;
+use DXBearing;
+use CmdAlias;
+use Filter;
+use Minimuf;
+use DXDb;
+use AnnTalk;
+use WCY;
+use Sun;
+use Internet;
+use Script;
+
 
 use strict;
-use vars qw(%Cache %cmd_cache);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
+
+%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
+$maxerrors = 20;                               # the maximum number of concurrent errors allowed before disconnection
+$maxbadcount = 3;                              # no of bad words allowed before disconnection
 
-%Cache = ();                  # cache of dynamically loaded routine's mod times
-%cmd_cache = ();            # cache of short names
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -31,9 +57,15 @@ use vars qw(%Cache %cmd_cache);
 
 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;
+       my $self = DXChannel::alloc(@_);
+
+       # 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));
+       DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
+
+       return $self;
 }
 
 # this is how a a connection starts, you get a hello message and the motd with
@@ -42,78 +74,381 @@ sub new
 
 sub start
 { 
-  my ($self, $line) = @_;
-  my $user = $self->{user};
-  my $call = $self->{call};
-  my $name = $user->{name};
-
-  $self->{name} = $name ? $name : $call;
-  $self->msg('l2',$self->{name});
-  $self->send_file($main::motd) if (-e $main::motd);
-  $self->msg('pr', $call);
-  $self->state('prompt');                  # a bit of room for further expansion, passwords etc
-  $self->{priv} = $user->priv;
-  $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->{wwv} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
-  $self->prompt() if $self->{state} =~ /^prompt/o;
-  
-  # 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);
+       my ($self, $line, $sort) = @_;
+       my $user = $self->{user};
+       my $call = $self->{call};
+       my $name = $user->{name};
+       
+       # log it
+       my $host = $self->{conn}->{peerhost} || "unknown";
+       Log('DXCommand', "$call connected from $host");
+
+       $self->{name} = $name ? $name : $call;
+       $self->send($self->msg('l2',$self->{name}));
+       $self->state('prompt');         # a bit of room for further expansion, passwords etc
+       $self->{priv} = $user->priv || 0;
+       $self->{lang} = $user->lang || $main::lang || 'en';
+       $self->{pagelth} = $user->pagelth || 20;
+       ($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
+       $self->{width} = 80 unless $self->{width} && $self->{width} > 80;
+       $self->{consort} = $line;       # save the connection type
+       
+       # set some necessary flags on the user if they are connecting
+       $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->{ann_talk} = $user->wantann_talk;
+       $self->{here} = 1;
+
+       # sort out registration
+       if ($main::reqreg == 1) {
+               $self->{registered} = $user->registered;
+       } elsif ($main::reqreg == 2) {
+               $self->{registered} = !$user->registered;
+       } else {
+               $self->{registered} = 1;
+       }
+
+
+       # decide which motd to send
+       my $motd = "${main::motd}_nor" unless $self->{registered};
+       $motd = $main::motd unless $motd && -e $motd;
+       $self->send_file($motd) if -e $motd;
+
+       # sort out privilege reduction
+       $self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
+
+       # get the filters
+       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
+       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
+
+       # clean up qra locators
+       my $qra = $user->qra;
+       $qra = undef if ($qra && !DXBearing::is_qra($qra));
+       unless ($qra) {
+               my $lat = $user->lat;
+               my $long = $user->long;
+               $user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
+       }
+
+       # decide on echo
+       my $echo = $user->wantecho;
+       unless ($echo) {
+               $self->send_now('E', "0");
+               $self->send($self->msg('echow'));
+               $self->conn->echo($echo) if $self->conn->can('echo');
+       }
+       
+       $self->tell_login('loginu');
+       
+       # do we need to send a forward/opernam?
+       my $lastoper = $user->lastoper || 0;
+       my $homenode = $user->homenode || ""; 
+       if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
+               run_cmd($main::me, "forward/opernam $call");
+               $user->lastoper($main::systime);
+       }
+
+       # run a script send the output to the punter
+       my $script = new Script(lc $call) || new Script('user_default');
+       $script->run($self) if $script;
+
+       # send cluster info
+       my $info = Route::cluster();
+       $self->send("Cluster:$info");
+
+       # send prompts and things
+       $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->prompt;
 }
 
 #
 # This is the normal command prompt driver
 #
+
 sub normal
 {
-  my $self = shift;
-  my $user = $self->{user};
-  my $call = $self->{call};
-  my $cmdline = shift;
-
-  # strip out //
-  $cmdline =~ s|//|/|og;
-  
-  # split the command line up into parts, the first part is the command
-  my ($cmd, $args) = $cmdline =~ /^([\w\/]+)\s*(.*)/o;
-
-  if ($cmd) {
-    
-       my ($path, $fcmd);
-   
-    # first expand out the entry to a command
-    ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
-    ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
-
-    my @ans = $self->eval_file($path, $fcmd, $args) if $path && $fcmd;
-#      @ans = $self->eval_file($main::cmd, $cmd, $args) if !$ans[0];
-       if ($ans[0]) {
-      shift @ans;
-         $self->send(@ans) if @ans > 0;
+       my $self = shift;
+       my $cmdline = shift;
+       my @ans;
+       
+       # remove leading and trailing spaces
+       $cmdline =~ s/^\s*(.*)\s*$/$1/;
+       
+       if ($self->{state} eq 'page') {
+               my $i = $self->{pagelth};
+               my $ref = $self->{pagedata};
+               my $tot = @$ref;
+               
+               # abort if we get a line starting in with a
+               if ($cmdline =~ /^a/io) {
+                       undef $ref;
+                       $i = 0;
+               }
+        
+               # send a tranche of data
+               while ($i-- > 0 && @$ref) {
+                       my $line = shift @$ref;
+                       $line =~ s/\s+$//o;     # why am having to do this? 
+                       $self->send($line);
+               }
+               
+               # reset state if none or else chuck out an intermediate prompt
+               if ($ref && @$ref) {
+                       $tot -= $self->{pagelth};
+                       $self->send($self->msg('page', $tot));
+               } else {
+                       $self->state('prompt');
+               }
+       } elsif ($self->{state} eq 'sysop') {
+               my $passwd = $self->{user}->passwd;
+               if ($passwd) {
+                       my @pw = grep {$_ !~ /\s/} split //, $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'));
+               }
+               $self->state('prompt');
+       } elsif ($self->{state} eq 'passwd') {
+               my $passwd = $self->{user}->passwd;
+               if ($passwd && $cmdline eq $passwd) {
+                       $self->send($self->msg('pw1'));
+                       $self->state('passwd1');
+               } else {
+                       $self->conn->{echo} = $self->conn->{decho};
+                       delete $self->conn->{decho};
+                       $self->send($self->msg('sorry'));
+                       $self->state('prompt');
+               }
+       } elsif ($self->{state} eq 'passwd1') {
+               $self->{passwd} = $cmdline;
+               $self->send($self->msg('pw2'));
+               $self->state('passwd2');
+       } elsif ($self->{state} eq 'passwd2') {
+               if ($cmdline eq $self->{passwd}) {
+                       $self->{user}->passwd($cmdline);
+                       $self->send($self->msg('pw3'));
+               } else {
+                       $self->send($self->msg('pw4'));
+               }
+               $self->conn->{echo} = $self->conn->{decho};
+               delete $self->conn->{decho};
+               $self->state('prompt');
+       } elsif ($self->{state} eq 'talk') {
+               if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
+                       for (@{$self->{talklist}}) {
+                               $self->send_talks($_,  $self->msg('talkend'));
+                       }
+                       $self->state('prompt');
+                       delete $self->{talklist};
+               } elsif ($cmdline =~ m(^/\w+)) {
+                       $cmdline =~ s(^/)();
+                       $self->send_ans(run_cmd($self, $cmdline));
+                       $self->send($self->talk_prompt);
+               } elsif ($self->{talklist} && @{$self->{talklist}}) {
+                       # send what has been said to whoever is in this person's talk list
+                       my @bad;
+                       if (@bad = BadWords::check($cmdline)) {
+                               $self->badcount(($self->badcount||0) + @bad);
+                               Log('DXCommand', "$self->{call} swore: $cmdline");
+                       } else {
+                               for (@{$self->{talklist}}) {
+                                       $self->send_talks($_, $cmdline);
+                               }
+                       }
+                       $self->send($self->talk_prompt) if $self->{state} eq 'talk';
+               } else {
+                       # for safety
+                       $self->state('prompt');
+               }
+       } elsif (my $func = $self->{func}) {
+               no strict 'refs';
+               my @ans;
+               if (ref $self->{edit}) {
+                       eval { @ans = $self->{edit}->$func($self, $cmdline)};
+               } else {
+                       eval {  @ans = &{$self->{func}}($self, $cmdline) };
+               }
+               if ($@) {
+                       $self->send_ans("Syserr: on stored func $self->{func}", $@);
+                       delete $self->{func};
+                       $self->state('prompt');
+                       undef $@;
+               }
+               $self->send_ans(@ans);
        } else {
-      shift @ans;
-         if (@ans > 0) {
-           $self->msg('e2', @ans);
-         } else {
-        $self->msg('e1');
-         }
+               $self->send_ans(run_cmd($self, $cmdline));
+       } 
+
+       # check for excessive swearing
+       if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
+               Log('DXCommand', "$self->{call} logged out for excessive swearing");
+               $self->disconnect;
+               return;
        }
-  } else {
-    $self->msg('e1');
-  }
-  
-  # send a prompt only if we are in a prompt state
-  $self->prompt() if $self->{state} =~ /^prompt/o;
+
+       # send a prompt only if we are in a prompt state
+       $self->prompt() if $self->{state} =~ /^prompt/o;
+}
+
+# send out the talk messages taking into account vias and connectivity
+sub send_talks
+{
+       my ($self, $ent, $line) = @_;
+       
+       my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
+       $to = $ent unless $to;
+       my $call = $via ? $via : $to;
+       my $clref = Route::get($call);
+       my $dxchan = $clref->dxchan if $clref;
+       if ($dxchan) {
+               $dxchan->talk($self->{call}, $to, $via, $line);
+       } else {
+               $self->send($self->msg('disc2', $via ? $via : $to));
+               my @l = grep { $_ ne $ent } @{$self->{talklist}};
+               if (@l) {
+                       $self->{talklist} = \@l;
+               } else {
+                       delete $self->{talklist};
+                       $self->state('prompt');
+               }
+       }
+}
+
+sub talk_prompt
+{
+       my $self = shift;
+       my @call;
+       for (@{$self->{talklist}}) {
+               my ($to, $via) = /(\S+)>(\S+)/;
+               $to = $_ unless $to;
+               push @call, $to;
+       }
+       return $self->msg('talkprompt', join(',', @call));
+}
+
+#
+# send a load of stuff to a command user with page prompting
+# and stuff
+#
+
+sub send_ans
+{
+       my $self = shift;
+       
+       if ($self->{pagelth} && @_ > $self->{pagelth}) {
+               my $i;
+               for ($i = $self->{pagelth}; $i-- > 0; ) {
+                       my $line = shift @_;
+                       $line =~ s/\s+$//o;     # why am having to do this? 
+                       $self->send($line);
+               }
+               $self->{pagedata} =  [ @_ ];
+               $self->state('page');
+               $self->send($self->msg('page', scalar @_));
+       } else {
+               for (@_) {
+                       if (defined $_) {
+                               $self->send($_);
+                       } else {
+                               $self->send('');
+                       }
+               }
+       } 
+}
+# 
+# this is the thing that runs the command, it is done like this for the 
+# benefit of remote command execution
+#
+
+sub run_cmd
+{
+       my $self = shift;
+       my $user = $self->{user};
+       my $call = $self->{call};
+       my $cmdline = shift;
+       my @ans;
+       
+
+       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) = split /\s+/, $cmdline, 2;
+       $args = "" unless defined $args;
+               
+       if ($cmd) {
+                       
+               my ($path, $fcmd);
+                       
+               dbg("cmd: $cmd") if isdbg('command');
+                       
+               # alias it if possible
+               my $acmd = CmdAlias::get_cmd($cmd);
+               if ($acmd) {
+                       ($cmd, $args) = split /\s+/, "$acmd $args", 2;
+                       $args = "" unless defined $args;
+                       dbg("aliased cmd: $cmd $args") if isdbg('command');
+               }
+                       
+               # first expand out the entry to a command
+               ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
+               ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
+
+               if ($path && $cmd) {
+                       dbg("path: $cmd cmd: $fcmd") if isdbg('command');
+                       
+                       my $package = find_cmd_name($path, $fcmd);
+                       return ($@) if $@;
+                               
+                       if ($package) {
+                               no strict 'refs';
+                               dbg("package: $package") if isdbg('command');
+                               eval { @ans = &$package($self, $args) };
+                               return (DXDebug::shortmess($@)) if $@;
+                       }
+               } 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'));
+                       }
+               }
+       }
+       
+       my $ok = shift @ans;
+       if ($ok) {
+               delete $self->{errors};
+       } else {
+               if (++$self->{errors} > $maxerrors) {
+                       $self->send($self->msg('e26'));
+                       $self->disconnect;
+                       return ();
+               }
+       }
+       return (@ans);
 }
 
 #
@@ -122,41 +457,60 @@ sub normal
 #
 sub process
 {
-  my $t = time;
-  my @chan = DXChannel->get_all();
-  my $chan;
-  
-  foreach $chan (@chan) {
-    next if $chan->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);
+       my $t = time;
+       my @dxchan = DXChannel->get_all();
+       my $dxchan;
+       
+       foreach $dxchan (@dxchan) {
+               next if $dxchan->sort ne 'U';  
+               
+               # send a prompt if no activity out on this channel
+               if ($t >= $dxchan->t + $main::user_interval) {
+                       $dxchan->prompt() if $dxchan->{state} =~ /^prompt/o;
+                       $dxchan->t($t);
+               }
+       }
+
+       while (my ($k, $v) = each %nothereslug) {
+               if ($main::systime >= $v + 300) {
+                       delete $nothereslug{$k};
+               }
        }
-  }
 }
 
 #
 # finish up a user context
 #
-sub finish
+sub disconnect
 {
-  my $self = shift;
-  my $call = $self->call;
-
-  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);
-
-  # issue a pc17 to everybody interested
-  my $nchan = DXChannel->get($main::mycall);
-  my $pc17 = $nchan->pc17($self);
-  DXProt::broadcast_ak1a($pc17);
-  
-  $ref->del() if $ref;
+       my $self = shift;
+       my $call = $self->call;
+
+       return if $self->{disconnecting}++;
+
+       delete $self->{senddbg};
+
+       my $uref = Route::User::get($call);
+       my @rout;
+       if ($uref) {
+               @rout = $main::routeroot->del_user($uref);
+               dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+       } else {
+               confess "trying to disconnect a non existant user $call";
+       }
+
+       # issue a pc17 to everybody interested
+       DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
+
+       # I was the last node visited
+    $self->user->node($main::mycall);
+               
+       # send info to all logged in thingies
+       $self->tell_login('logoutu');
+
+       Log('DXCommand', "$call disconnected");
+
+       $self->SUPER::disconnect;
 }
 
 #
@@ -165,39 +519,35 @@ sub finish
 
 sub prompt
 {
-  my $self = shift;
-  my $call = $self->{call};
-  DXChannel::msg($self, 'pr', $call);
+       my $self = shift;
+       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
 sub broadcast
 {
-  my $pkg = shift;                # ignored
-  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);
-  
-L: foreach $chan (@list) {
-     next if !$chan->sort eq 'U';  # only interested in user channels  
-        foreach $except (@except) {
-          next L if $except == $chan;  # ignore channels in the 'except' list
-        }
-        chan->send($s);              # send it
-  }
+       my $pkg = shift;                        # ignored
+       my $s = shift;                          # the line to be rebroadcast
+       
+    foreach my $dxchan (DXChannel->get_all()) {
+               next unless $dxchan->{sort} eq 'U'; # only interested in user channels  
+               next if grep $dxchan == $_, @_;
+               $dxchan->send($s);                      # send it
+       }
 }
 
 # gimme all the users
 sub get_all
 {
-  my @list = DXChannel->get_all();
-  my $ref;
-  my @out;
-  foreach $ref (@list) {
-    push @out, $ref if $ref->sort eq 'U';
-  }
-  return @out;
+       return grep {$_->{sort} eq 'U'} DXChannel->get_all();
+}
+
+# run a script for this user
+sub run_script
+{
+       my $self = shift;
+       my $silent = shift || 0;
+       
 }
 
 #
@@ -206,61 +556,75 @@ sub get_all
 
 sub search
 {
-  my ($path, $short_cmd, $suffix) = @_;
-  my ($apath, $acmd);
-
-  # commands are lower case
-  $short_cmd = lc $short_cmd;
-  dbg('command', "command: $path $short_cmd\n");
-  
-  # return immediately if we have it
-  my ($apath, $acmd) = split ',', $cmd_cache{$short_cmd};
-  if ($apath && $acmd) {
-    dbg('command', "cached $short_cmd = ($apath, $acmd)\n");
-    return ($apath, $acmd) if $apath;
-  }
-  
-  # if not guess
-  my @parts = split '/', $short_cmd;
-  my $dirfn;
-  my $curdir = $path;
-  my $p;
-  my $i;
-  
-  for ($i = 0; $i < @parts; $i++) {
-    my  $p = $parts[$i];
-       opendir(D, $curdir) or confess "can't open $curdir $!";
-       my @ls = readdir D;
-       closedir D;
-       my $l;
-       foreach $l (sort @ls) {
-         next if $l =~ /^\./;
-      if ($i < $#parts) {            # we are dealing with directories
-        if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
-                 dbg('command', "got dir: $curdir/$l\n");
-                 $dirfn .= "$l/";
-                 $curdir .= "/$l";
-                 last;
-               }
-      } else {                       # we are dealing with commands
-               next if !$l =~ /\.$suffix$/;       # only look for .$suffix files
-               if ($p eq substr($l, 0, length $p)) {
-                 $l =~ s/\.$suffix$//;      # remove the suffix
-                 chop $dirfn;               # remove trailing /
-                 $cmd_cache{"$short_cmd"} = join(',', ($path, "$dirfn/$l"));   # cache it
-          dbg('command', "got path: $path cmd: $dirfn/$l\n");
-                 return ($path, "$dirfn/$l"); 
+       my ($path, $short_cmd, $suffix) = @_;
+       my ($apath, $acmd);
+       
+       # commands are lower case
+       $short_cmd = lc $short_cmd;
+       dbg("command: $path $short_cmd\n") if isdbg('command');
+
+       # do some checking for funny characters
+       return () if $short_cmd =~ /\/$/;
+
+       # return immediately if we have it
+       ($apath, $acmd) = split ',', $cmd_cache{$short_cmd} if $cmd_cache{$short_cmd};
+       if ($apath && $acmd) {
+               dbg("cached $short_cmd = ($apath, $acmd)\n") if isdbg('command');
+               return ($apath, $acmd);
+       }
+       
+       # if not guess
+       my @parts = split '/', $short_cmd;
+       my $dirfn;
+       my $curdir = $path;
+       my $p;
+       my $i;
+       my @lparts;
+       
+       for ($i = 0; $i < @parts; $i++) {
+               my  $p = $parts[$i];
+               opendir(D, $curdir) or confess "can't open $curdir $!";
+               my @ls = readdir D;
+               closedir D;
+               my $l;
+               foreach $l (sort @ls) {
+                       next if $l =~ /^\./;
+                       if ($i < $#parts) {             # we are dealing with directories
+                               if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
+                                       dbg("got dir: $curdir/$l\n") if isdbg('command');
+                                       $dirfn .= "$l/";
+                                       $curdir .= "/$l";
+                                       last;
+                               }
+                       } else {                        # we are dealing with commands
+                               @lparts = split /\./, $l;                  
+                               next if $lparts[$#lparts] ne $suffix;        # only look for .$suffix files
+                               if ($p eq substr($l, 0, length $p)) {
+                                       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("got path: $path cmd: $dirfn$l\n") if isdbg('command');
+                                       return ($path, "$dirfn$l"); 
+                               }
+                       }
                }
-         }
        }
-  }
-  return ();  
+       return ();  
 }  
 
 # clear the command name cache
 sub clear_cmd_cache
 {
-  %cmd_cache = ();
+       no strict 'refs';
+       
+       for (keys %Cache) {
+               undef *{$_};
+               dbg("Undefining cmd $_") if isdbg('command');
+       }
+       %cmd_cache = ();
+       %Cache = ();
 }
 
 #
@@ -275,93 +639,208 @@ sub clear_cmd_cache
 #require Devel::Symdump;  
 
 sub valid_package_name {
-  my($string) = @_;
-  $string =~ s/([^A-Za-z0-9\/])/sprintf("_%2x",unpack("C",$1))/eg;
-  
-  #second pass only for words starting with a digit
-  $string =~ s|/(\d)|sprintf("/_%2x",unpack("C",$1))|eg;
+       my($string) = @_;
+       $string =~ s|([^A-Za-z0-9_/])|sprintf("_%2x",unpack("C",$1))|eg;
        
-  #Dress it up as a real package name
-  $string =~ s|/|_|g;
-  return "Emb_" . $string;
+       $string =~ s|/|_|g;
+       return "cmd_$string";
 }
 
-#borrowed from Safe.pm
-sub delete_package {
-  my $pkg = shift;
-  my ($stem, $leaf);
+# 
+# this bit of magic finds a command in the offered directory
+sub find_cmd_name {
+       my $path = shift;
+       my $cmdname = shift;
+       my $package = valid_package_name($cmdname);
+       my $filename = "$path/$cmdname.pl";
+       my $mtime = -M $filename;
        
-  no strict 'refs';
-  $pkg = "DXChannel::$pkg\::";    # expand to full symbol table name
-  ($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
+       # return if we can't find it
+       $errstr = undef;
+       unless (defined $mtime) {
+               $errstr = DXM::msg('e1');
+               return undef;
+       }
        
-  my $stem_symtab = *{$stem}{HASH};
+       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 {
+
+               my $sub = readfilestr($filename);
+               unless ($sub) {
+                       $errstr = "Syserr: can't open '$filename' $!";
+                       return undef;
+               };
+               
+               #wrap the code into a subroutine inside our unique package
+               my $eval = qq( sub $package { $sub } );
+               
+               if (isdbg('eval')) {
+                       my @list = split /\n/, $eval;
+                       my $line;
+                       for (@list) {
+                               dbg($_ . "\n") if isdbg('eval');
+                       }
+               }
+               
+               # get rid of any existing sub and try to compile the new one
+               no strict 'refs';
+
+               if (exists $Cache{$package}) {
+                       dbg("Redefining $package") if isdbg('command');
+                       undef *$package;
+               } else {
+                       dbg("Defining $package") if isdbg('command');
+               }
+               eval $eval;
+               
+               $Cache{$package} = {mtime => $mtime };
+           
+       }
+
+       return $package;
+}
+
+sub local_send
+{
+       my ($self, $let, $buf) = @_;
+       if ($self->{state} eq 'prompt' || $self->{state} eq 'talk') {
+               if ($self->{enhanced}) {
+                       $self->send_later($let, $buf);
+               } else {
+                       $self->send($buf);
+               }
+       } else {
+               $self->delay($buf);
+       }
+}
+
+# send a talk message here
+sub talk
+{
+       my ($self, $from, $to, $via, $line) = @_;
+       $line =~ s/\\5E/\^/g;
+       $self->local_send('T', "$to de $from: $line") if $self->{talk};
+       Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+       # send a 'not here' message if required
+       unless ($self->{here} && $from ne $to) {
+               my $key = "$to$from";
+               unless (exists $nothereslug{$key}) {
+                       my ($ref, $dxchan);
+                       if (($ref = Route::get($from)) && ($dxchan = $ref->dxchan)) {
+                               my $name = $self->user->name || $to;
+                               my $s = $self->user->nothere || $dxchan->msg('nothere', $name);
+                               $nothereslug{$key} = $main::systime;
+                               $dxchan->talk($to, $from, undef, $s);
+                       }
+               }
+       }
+}
+
+# send an announce
+sub announce
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my $to = shift;
+       my $target = shift;
+       my $text = shift;
+       my ($filter, $hops);
+
+       if (!$self->{ann_talk} && $to ne $self->{call}) {
+               my $call = AnnTalk::is_talk_candidate($_[0], $text);
+               return if $call;
+       }
+
+       if ($self->{annfilter}) {
+               ($filter, $hops) = $self->{annfilter}->it(@_ );
+               return unless $filter;
+       }
+
+       unless ($self->{ann}) {
+               return if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+       }
+       return if $target eq 'SYSOP' && $self->{priv} < 5;
+       my $buf = "$to$target de $_[0]: $text";
+       $buf =~ s/\%5E/^/g;
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
+}
+
+# send a dx spot
+sub dx_spot
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my ($filter, $hops);
+
+       return unless $self->{dx};
        
-  delete $stem_symtab->{$leaf};
+       if ($self->{spotsfilter}) {
+               ($filter, $hops) = $self->{spotsfilter}->it(@_ );
+               return unless $filter;
+       }
+
+       my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+       $buf .= "\a\a" if $self->{beep};
+       $buf =~ s/\%5E/^/g;
+       $self->local_send('X', $buf);
 }
 
-sub eval_file {
-  my $self = shift;
-  my $path = shift;
-  my $cmdname = shift;
-  my $package = valid_package_name($cmdname);
-  my $filename = "$path/$cmdname.pl";
-  my $mtime = -M $filename;
-  
-  # return if we can't find it
-  return (0, DXM::msg('e1')) if !defined $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 {
-       local *FH;
-       if (!open FH, $filename) {
-         return (0, "Syserr: can't open '$filename' $!"); 
-       };
-       local($/) = undef;
-       my $sub = <FH>;
-       close FH;
-               
-    #wrap the code into a subroutine inside our unique package
-       my $eval = qq{package DXChannel; sub $package { $sub; }};
-       if (isdbg('eval')) {
-         my @list = split /\n/, $eval;
-         my $line;
-         foreach (@list) {
-           dbg('eval', $_, "\n");
-         }
+sub wwv
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my ($filter, $hops);
+
+       return unless $self->{wwv};
+       
+       if ($self->{wwvfilter}) {
+               ($filter, $hops) = $self->{wwvfilter}->it(@_ );
+               return unless $filter;
        }
-       #print "eval $eval\n";
-       {
-         #hide our variables within this block
-         my($filename,$mtime,$package,$sub);
-         eval $eval;
+
+       my $buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send('V', $buf);
+}
+
+sub wcy
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my ($filter, $hops);
+
+       return unless $self->{wcy};
+       
+       if ($self->{wcyfilter}) {
+               ($filter, $hops) = $self->{wcyfilter}->it(@_ );
+               return unless $filter;
        }
-       if ($@) {
-         delete_package($package);
-         return (1, "Syserr: Eval err $@ on $package");
+
+       my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send('Y', $buf);
+}
+
+# broadcast debug stuff to all interested parties
+sub broadcast_debug
+{
+       my $s = shift;                          # the line to be rebroadcast
+       
+       foreach my $dxchan (DXChannel->get_all) {
+               next unless $dxchan->{enhanced} && $dxchan->{senddbg};
+               $dxchan->send_later('L', $s);
        }
-               
-       #cache it unless we're cleaning out each time
-       $Cache{$package}{mtime} = $mtime;
-  }
-  
-  my @r;
-  my $c = qq{ \@r = \$self->$package(\@_); };
-  dbg('eval', "cluster cmd = $c\n");
-  eval  $c;
-  if ($@) {
-    delete_package($package);
-       return (1, "Syserr: Eval err $@ on cached $package");
-  }
-
-  #take a look if you want
-  #print Devel::Symdump->rnew($package)->as_string, $/;
-  return @r;
 }
 
+
 1;
 __END__