add sh/fdx command.
[spider.git] / perl / DXCommandmode.pm
index d8f6eb54d6bbb7ab61b603b058ac5b71da874d49..aa6f743d39d3657546cee962364193c26b4ac044 100644 (file)
@@ -29,15 +29,29 @@ use DXDb;
 use AnnTalk;
 use WCY;
 use Sun;
+use Internet;
+use Script;
+use Net::Telnet;
+use QSL;
+use DB_File;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
+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
+
+
+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
@@ -46,6 +60,16 @@ $scriptbase = "$main::root/scripts"; # the place where all users start scripts g
 sub new 
 {
        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));
+
+       # ALWAYS output the user
+       my $ref = Route::User::get($call);
+       $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
+
        return $self;
 }
 
@@ -60,14 +84,18 @@ sub start
        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->send_file($main::motd) if (-e $main::motd);
        $self->state('prompt');         # a bit of room for further expansion, passwords etc
        $self->{priv} = $user->priv || 0;
-       $self->{lang} = $user->lang || 'en';
+       $self->{lang} = $user->lang || $main::lang || 'en';
        $self->{pagelth} = $user->pagelth || 20;
-       $self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
+       ($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
@@ -79,7 +107,38 @@ sub start
        $self->{wx} = $user->wantwx;
        $self->{dx} = $user->wantdx;
        $self->{logininfo} = $user->wantlogininfo;
+       $self->{ann_talk} = $user->wantann_talk;
        $self->{here} = 1;
+       $self->{prompt} = $user->prompt if $user->prompt;
+
+       # sort out new dx spot stuff
+       $user->wantdxcq(0) unless defined $user->{wantdxcq};
+       $user->wantdxitu(0) unless defined $user->{wantdxitu};  
+       $user->wantusstate(0) unless defined $user->{wantusstate};
+
+       # 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;
@@ -90,37 +149,39 @@ sub start
                $user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
        }
 
-       # 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);
-       for (@pc16) {
-               DXProt::broadcast_all_ak1a($_);
+       # 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 && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
+               run_cmd($main::me, "forward/opernam $call");
+               $user->lastoper($main::systime + ((int rand(10)) * 86400));
        }
-       Log('DXCommand', "$call connected");
 
-       # send prompts and things
-       my $info = DXCluster::cluster();
+       # 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->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->prompt;
 }
 
 #
@@ -132,6 +193,9 @@ sub normal
        my $self = shift;
        my $cmdline = shift;
        my @ans;
+
+       # save this for them's that need it
+       my $rawline = $cmdline;
        
        # remove leading and trailing spaces
        $cmdline =~ s/^\s*(.*)\s*$/$1/;
@@ -163,8 +227,8 @@ sub normal
                }
        } elsif ($self->{state} eq 'sysop') {
                my $passwd = $self->{user}->passwd;
-               my @pw = split / */, $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/) {
@@ -175,7 +239,31 @@ sub normal
                } else {
                        $self->send($self->msg('sorry'));
                }
-               delete $self->{passwd};
+               $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) {
@@ -184,24 +272,67 @@ sub normal
                        }
                        $self->state('prompt');
                        delete $self->{talklist};
-               } elsif ($cmdline =~ m(^/\w+)) {
-                       $cmdline =~ s(^/)();
-                       $self->send_ans(run_cmd($self, $cmdline));
+               } elsif ($cmdline =~ m|^/+\w+|) {
+                       $cmdline =~ s|^/||;
+                       my $sendit = $cmdline =~ s|^/+||;
+                       my @in = $self->run_cmd($cmdline);
+                       $self->send_ans(@in);
+                       if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+                               foreach my $l (@in) {
+                                       my @bad;
+                                       if (@bad = BadWords::check($l)) {
+                                               $self->badcount(($self->badcount||0) + @bad);
+                                               Log('DXCommand', "$self->{call} swore: $l");
+                                       } else {
+                                               for (@{$self->{talklist}}) {
+                                                       $self->send_talks($_, $l);
+                                               }
+                                       }
+                               }
+                       }
                        $self->send($self->talk_prompt);
                } elsif ($self->{talklist} && @{$self->{talklist}}) {
                        # send what has been said to whoever is in this person's talk list
-                       for (@{$self->{talklist}}) {
-                               $self->send_talks($_, $cmdline);
+                       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($_, $rawline);
+                               }
                        }
                        $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, $rawline)};
+               } else {
+                       eval {  @ans = &{$self->{func}}($self, $rawline) };
+               }
+               if ($@) {
+                       $self->send_ans("Syserr: on stored func $self->{func}", $@);
+                       delete $self->{func};
+                       $self->state('prompt');
+                       undef $@;
+               }
+               $self->send_ans(@ans);
        } else {
                $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;
+       }
+
        # send a prompt only if we are in a prompt state
        $self->prompt() if $self->{state} =~ /^prompt/o;
 }
@@ -214,7 +345,7 @@ sub send_talks
        my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
        $to = $ent unless $to;
        my $call = $via ? $via : $to;
-       my $clref = DXCluster->get_exact($call);
+       my $clref = Route::get($call);
        my $dxchan = $clref->dxchan if $clref;
        if ($dxchan) {
                $dxchan->talk($self->{call}, $to, $via, $line);
@@ -263,7 +394,11 @@ sub send_ans
                $self->send($self->msg('page', scalar @_));
        } else {
                for (@_) {
-                       $self->send($_) if $_;
+                       if (defined $_) {
+                               $self->send($_);
+                       } else {
+                               $self->send('');
+                       }
                }
        } 
 }
@@ -280,77 +415,69 @@ sub run_cmd
        my $cmdline = shift;
        my @ans;
        
-       if ($self->{func}) {
-               my $c = qq{ \@ans = $self->{func}(\$self, \$cmdline) };
-               dbg('eval', "stored func cmd = $c\n");
-               eval  $c;
-               if ($@) {
-                       return ("Syserr: Eval err $errstr on stored func $self->{func}", $@);
-               }
-       } else {
 
-               return () if length $cmdline == 0;
+       return () if length $cmdline == 0;
                
-               # strip out //
-               $cmdline =~ s|//|/|og;
+       # 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 $args;
+       # 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) {
+       if ($cmd) {
                        
-                       my ($path, $fcmd);
+               my ($path, $fcmd);
                        
-                       dbg('command', "cmd: $cmd");
+               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 $args;
-                               dbg('command', "aliased cmd: $cmd $args");
-                       }
+               # 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;
+               # 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('command', "path: $cmd cmd: $fcmd");
+               if ($path && $cmd) {
+                       dbg("path: $cmd cmd: $fcmd") if isdbg('command');
                        
-                               my $package = find_cmd_name($path, $fcmd);
-                               @ans = (0) if !$package ;
+                       my $package = find_cmd_name($path, $fcmd);
+                       return ($@) if $@;
                                
-                               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);
-                                   };
-                                       
-                                       if ($@) {
-                                               #cluck($@);
-                                               return (DXDebug::shortmess($@));
-                                       };
-                               }
+                       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 {
-                               dbg('command', "cmd: $cmd not found");
                                return ($self->msg('e1'));
                        }
                }
        }
        
-       shift @ans;
-       return (@ans);
+       my $ok = shift @ans;
+       if ($ok) {
+               delete $self->{errors};
+       } else {
+               if (++$self->{errors} > $maxerrors) {
+                       $self->send($self->msg('e26'));
+                       $self->disconnect;
+                       return ();
+               }
+       }
+       return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -372,45 +499,47 @@ sub process
                        $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 $conn = shift;
        my $call = $self->call;
 
-       # I was the last node visited
-    $self->user->node($main::mycall);
-               
-       # log out text
-       if ($conn && -e "$main::data/logout") {
-               open(I, "$main::data/logout") or confess;
-               my @in = <I>;
-               close(I);
-               $self->send_now('D', @in);
-               sleep(1);
-       }
+       return if $self->{disconnecting}++;
+
+       delete $self->{senddbg};
 
-       if ($call eq $main::myalias) { # unset the channel if it is us really
-               my $node = DXNode->get($main::mycall);
-               $node->{dxchan} = 0;
+       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');
+
+               # issue a pc17 to everybody interested
+               $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+       } else {
+               confess "trying to disconnect a non existant user $call";
        }
-       
-       # issue a pc17 to everybody interested
-       my $nchan = DXChannel->get($main::mycall);
-       my $pc17 = $nchan->pc17($self);
-       DXProt::broadcast_all_ak1a($pc17);
 
+       # 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");
-       my $ref = DXCluster->get_exact($call);
-       $ref->del() if $ref;
+
+       $self->SUPER::disconnect;
 }
 
 #
@@ -420,7 +549,11 @@ sub finish
 sub prompt
 {
        my $self = shift;
-       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+       if ($self->{prompt}) {
+               $self->send($self->{prompt});
+       } else {
+               $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]
@@ -428,15 +561,10 @@ 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 ($dxchan, $except);
        
- L: foreach $dxchan (@list) {
-               next if !$dxchan->sort eq 'U'; # only interested in user channels  
-               foreach $except (@except) {
-                       next L if $except == $dxchan;   # ignore channels in the 'except' list
-               }
+    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
        }
 }
@@ -444,13 +572,7 @@ sub broadcast
 # 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
@@ -472,7 +594,7 @@ sub search
        
        # commands are lower case
        $short_cmd = lc $short_cmd;
-       dbg('command', "command: $path $short_cmd\n");
+       dbg("command: $path $short_cmd\n") if isdbg('command');
 
        # do some checking for funny characters
        return () if $short_cmd =~ /\/$/;
@@ -480,7 +602,7 @@ sub search
        # return immediately if we have it
        ($apath, $acmd) = split ',', $cmd_cache{$short_cmd} if $cmd_cache{$short_cmd};
        if ($apath && $acmd) {
-               dbg('command', "cached $short_cmd = ($apath, $acmd)\n");
+               dbg("cached $short_cmd = ($apath, $acmd)\n") if isdbg('command');
                return ($apath, $acmd);
        }
        
@@ -502,7 +624,7 @@ sub search
                        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");
+                                       dbg("got dir: $curdir/$l\n") if isdbg('command');
                                        $dirfn .= "$l/";
                                        $curdir .= "/$l";
                                        last;
@@ -515,8 +637,8 @@ sub search
                                        $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");
+                                       $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"); 
                                }
                        }
@@ -528,7 +650,14 @@ sub search
 # clear the command name cache
 sub clear_cmd_cache
 {
+       no strict 'refs';
+       
+       for (keys %Cache) {
+               undef *{$_} unless /cmd_cache/;
+               dbg("Undefining cmd $_") if isdbg('command');
+       }
        %cmd_cache = ();
+       %Cache = ();
 }
 
 #
@@ -544,39 +673,10 @@ sub clear_cmd_cache
 
 sub valid_package_name {
        my($string) = @_;
-       $string =~ s/([^A-Za-z0-9\/])/sprintf("_%2x",unpack("C",$1))/eg;
+       $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;
-       
-       #Dress it up as a real package name
-       $string =~ s/\//_/og;
-       return $string;
-}
-
-# find a cmd reference
-# this is really for use in user written stubs
-#
-# use the result as a symbolic reference:-
-#
-# no strict 'refs';
-# @out = &$r($self, $line);
-#
-sub find_cmd_ref
-{
-       my $cmd = shift;
-       my $r;
-       
-       if ($cmd) {
-               
-               # first expand out the entry to a command
-               my ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
-               ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
-               
-               # make sure it is loaded
-               $r = find_cmd_name($path, $fcmd);
-       }
-       return $r;
+       $string =~ s|/|_|g;
+       return "cmd_$string";
 }
 
 # 
@@ -609,42 +709,223 @@ sub find_cmd_name {
                };
                
                #wrap the code into a subroutine inside our unique package
-               my $eval = qq( sub { $sub } );
+               my $eval = qq( sub $package { $sub } );
                
                if (isdbg('eval')) {
                        my @list = split /\n/, $eval;
                        my $line;
                        for (@list) {
-                               dbg('eval', $_, "\n");
+                               dbg($_ . "\n") if isdbg('eval');
                        }
                }
                
-               $Cache{$package} = {mtime => $mtime, 'eval' => $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->send("$to de $from $line") if $self->{talk};
-       Log('talk', $to, $from, $main::mycall, $line);
+       $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 chat
+sub chat
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my $target = shift;
+       my $to = shift;
+       my $text = shift;
+       my ($filter, $hops);
+
+       return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+       
+       $text =~ s/^\#\d+ //;
+       my $buf = "$target de $_[0]: $text";
+       $buf =~ s/\%5E/^/g;
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send('C', $buf);
+}
+
+sub format_dx_spot
+{
+       my $self = shift;
+
+       my $t = ztime($_[2]);
+       my $loc;
+       my $clth = $self->{consort} eq 'local' ? 29 : 30;
+       my $comment = substr $_[3], 0, $clth; 
+       $comment .= ' ' x ($clth - length($comment));
+       my $ref = DXUser->get_current($_[4]);
+       if ($ref) {
+               $loc = $ref->qra || '' if $self->{user}->wantgrid; 
+               $loc = ' ' . substr($loc, 0, 4) if $loc;
+       } 
+       $loc = "" unless $loc;
+
+       if ($self->{user}->wantdxitu) {
+               $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
+       } elsif ($self->{user}->wantdxcq) {
+               $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
+       } elsif ($self->{user}->wantusstate) {
+               $loc = ' ' . $_[13] if $_[13];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
+       }
+
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
 }
 
 # send a dx spot
 sub dx_spot
 {
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my ($filter, $hops);
+
+       return unless $self->{dx};
+       
+       if ($self->{spotsfilter}) {
+               ($filter, $hops) = $self->{spotsfilter}->it(@_ );
+               return unless $filter;
+       }
+
+       dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+       
+       my $buf = $self->format_dx_spot(@_);
+       $buf .= "\a\a" if $self->{beep};
+       $buf =~ s/\%5E/^/g;
+       $self->local_send('X', $buf);
+}
+
+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;
+       }
+
+       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;
+       }
+
+       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);
+       }
+}
+
+
 1;
 __END__