X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=c03885526a9ed96664d31f75e31a7995eac48bf8;hb=b735ad9a0325fae9ca0c2324794b99288a737802;hp=ca6c053e7d03cae21ba4376aff4b0eb102e5ef82;hpb=88c2b296ba903fdd356e351b83fcb844e2d6eacd;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ca6c053e..c0388552 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -24,18 +24,32 @@ use DXLogPrint;
 use DXBearing;
 use CmdAlias;
 use Filter;
-use Carp;
 use Minimuf;
 use DXDb;
+use AnnTalk;
+use WCY;
+use Sun;
+use Internet;
+use Script;
+
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -44,7 +58,13 @@ $scriptbase = "$main::root/scripts"; # the place where all users start scripts g
 sub new 
 {
 	my $self = DXChannel::alloc(@_);
-	$self->{'sort'} = 'U';		# in absence of how to find out what sort of an object I am
+
+	# 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;
 }
 
@@ -59,44 +79,98 @@ 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;
-	$self->{lang} = $user->lang;
-	$self->{pagelth} = 20;
-	$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
+	$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} = $self->{wwv} = $self->{wx} = $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->{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');
+	}
 	
-	# 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
+	$self->tell_login('loginu');
 	
-	# issue a pc16 to everybody interested
-	my $nchan = DXChannel->get($main::mycall);
-	my @pc16 = DXProt::pc16($nchan, $cuser);
-	for (@pc16) {
-		DXProt::broadcast_all_ak1a($_);
+	# 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);
 	}
-	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));
+	$self->prompt;
 }
 
 #
@@ -139,8 +213,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/) {
@@ -151,32 +225,154 @@ sub normal
 		} else {
 			$self->send($self->msg('sorry'));
 		}
-		delete $self->{passwd};
 		$self->state('prompt');
-	} else {
-		@ans = run_cmd($self, $cmdline);           # if length $cmdline;
-		
-		if ($self->{pagelth} && @ans > $self->{pagelth}) {
-			my $i;
-			for ($i = $self->{pagelth}; $i-- > 0; ) {
-				my $line = shift @ans;
-				$line =~ s/\s+$//o;	# why am having to do this? 
-				$self->send($line);
-			}
-			$self->{pagedata} =  \@ans;
-			$self->state('page');
-			$self->send($self->msg('page', scalar @ans));
+	} 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 {
-			for (@ans) {
-				$self->send($_) if $_;
+			$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 {
+		$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;
 }
 
+# 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
@@ -190,73 +386,68 @@ 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 ("Syserr: Syntax error in $package", $@);
-						}
-						$Cache{$package}->{sub} = $c;
-					}
-					$c = $Cache{$package}->{sub};
-					eval {
-						@ans = &{$c}($self, $args);
-				    };
-					
-					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 {
-				dbg('command', "cmd: $cmd not found");
 				return ($self->msg('e1'));
 			}
 		}
 	}
 	
-	shift @ans;
+	my $ok = shift @ans;
+	if ($ok) {
+		delete $self->{errors};
+	} else {
+		if (++$self->{errors} > $maxerrors) {
+			$self->send($self->msg('e26'));
+			$self->disconnect;
+			return ();
+		}
+	}
 	return (@ans);
 }
 
@@ -279,38 +470,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 $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);
-	}
+	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');
+	} else {
+		confess "trying to disconnect a non existant user $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_all_ak1a($pc17);
-	
+	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");
-	$ref->del() if $ref;
+
+	$self->SUPER::disconnect;
 }
 
 #
@@ -320,7 +520,7 @@ sub finish
 sub prompt
 {
 	my $self = shift;
-	$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+	$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]
@@ -328,15 +528,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
 	}
 }
@@ -344,13 +539,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
@@ -372,7 +561,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 =~ /\/$/;
@@ -380,7 +569,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);
 	}
 	
@@ -402,7 +591,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;
@@ -415,8 +604,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"); 
 				}
 			}
@@ -428,7 +617,14 @@ sub search
 # clear the command name cache
 sub clear_cmd_cache
 {
+	no strict 'refs';
+	
+	for (keys %Cache) {
+		undef *{$_};
+		dbg("Undefining cmd $_") if isdbg('command');
+	}
 	%cmd_cache = ();
+	%Cache = ();
 }
 
 #
@@ -444,39 +640,10 @@ sub clear_cmd_cache
 
 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;
-	
-	#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;
+	$string =~ s|([^A-Za-z0-9_/])|sprintf("_%2x",unpack("C",$1))|eg;
 	
-	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";
 }
 
 # 
@@ -509,21 +676,171 @@ 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->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};
+	
+	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 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__