X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=854a635496e058a651896d04bc8f412a381f84ea;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=79ba03b0b8f63ac3f189534677f9d4d55cb7c5e2;hpb=d3004b59ca0171c0afe6d9898c84830c809721af;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 79ba03b0..854a6354 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -4,15 +4,16 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 package DXCommandmode;
 
-use POSIX;
+#use POSIX;
 
 @ISA = qw(DXChannel);
 
+use POSIX qw(:math_h);
 use DXUtil;
 use DXChannel;
 use DXUser;
@@ -35,26 +36,22 @@ use Net::Telnet;
 use QSL;
 use DB_File;
 use VE7CC;
+use DXXml;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
-	$maxbadcount $msgpolltime $default_pagelth);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
+	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
 
 %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
 $msgpolltime = 3600;			# the time between polls for new messages 
-
-
-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;
+$cmdimportdir = "$main::root/cmd_import"; # the base directory for importing command scripts 
+                                          # this does not exist as default, you need to create it manually
+					  #
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -67,11 +64,15 @@ sub new
 	# 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));
+#	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1]);
 
 	# ALWAYS output the user
 	my $ref = Route::User::get($call);
-	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
+	if ($ref) {
+		$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref);
+		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes;
+	}
 
 	return $self;
 }
@@ -91,7 +92,7 @@ sub start
 	my $host = $self->{conn}->{peerhost};
 	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
 	$host ||= "unknown";
-	Log('DXCommand', "$call connected from $host");
+	LogDbg('DXCommand', "$call connected from $host");
 
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
@@ -141,16 +142,34 @@ sub start
 	}
 	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
 	$motd = $main::motd unless $motd && -e $motd;
+	if ($self->conn->{csort} eq 'ax25') {
+		if ($motd) {
+			$motd = "${motd}_ax25" if -e "${motd}_ax25";
+		} else {
+			$motd = "${main::motd}_ax25" if -e "${main::motd}_ax25";
+		}
+	}
 	$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) ;
+	my $nossid = $call;
+	$nossid =~ s/-\d+$//;
+	
+	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) 
+		|| Filter::read_in('spots', $nossid, 0)
+			|| Filter::read_in('spots', 'user_default', 0);
+	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) 
+		|| Filter::read_in('wwv', $nossid, 0) 
+			|| Filter::read_in('wwv', 'user_default', 0);
+	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) 
+		|| Filter::read_in('wcy', $nossid, 0) 
+			|| Filter::read_in('wcy', 'user_default', 0);
+	$self->{annfilter} = Filter::read_in('ann', $call, 0) 
+		|| Filter::read_in('ann', $nossid, 0) 
+			|| Filter::read_in('ann', 'user_default', 0) ;
 
 	# clean up qra locators
 	my $qra = $user->qra;
@@ -170,6 +189,7 @@ sub start
 	}
 	
 	$self->tell_login('loginu');
+	$self->tell_buddies('loginb');
 	
 	# do we need to send a forward/opernam?
 	my $lastoper = $user->lastoper || 0;
@@ -187,12 +207,23 @@ sub start
 	my $info = Route::cluster();
 	$self->send("Cluster:$info");
 
-	# send prompts and things
+	# send prompts for qth, name 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);
+
+	# send out any buddy messages for other people that are online
+	foreach my $call (@{$user->buddies}) {
+		my $ref = Route::User::get($call);
+		if ($ref) {
+			foreach my $node (@{$ref->parent}) {
+				$self->send($self->msg($node eq $main::mycall ? 'loginb' : 'loginbn', $call, $node));
+			} 
+		}
+	}
+
 	$self->lastmsgpoll($main::systime);
 	$self->prompt;
 }
@@ -278,10 +309,14 @@ sub normal
 		$self->conn->{echo} = $self->conn->{decho};
 		delete $self->conn->{decho};
 		$self->state('prompt');
-	} elsif ($self->{state} eq 'talk') {
+	} elsif ($self->{state} eq 'talk' || $self->{state} eq 'chat') {
 		if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
 			for (@{$self->{talklist}}) {
-				$self->send_talks($_,  $self->msg('talkend'));
+				if ($self->{state} eq 'talk') {
+					$self->send_talks($_,  $self->msg('talkend'));
+				} else {
+					$self->local_send('C', $self->msg('chatend', $_));
+				}
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
@@ -295,27 +330,36 @@ sub normal
 					my @bad;
 					if (@bad = BadWords::check($l)) {
 						$self->badcount(($self->badcount||0) + @bad);
-						Log('DXCommand', "$self->{call} swore: $l");
+						LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
 					} else {
 						for (@{$self->{talklist}}) {
-							$self->send_talks($_, $l);
+							if ($self->{state} eq 'talk') {
+								$self->send_talks($_, $l);
+							} else {
+								send_chats($self, $_, $l)
+							}
 						}
 					}
 				}
 			}
-			$self->send($self->talk_prompt);
+			$self->send($self->{state} eq 'talk' ? $self->talk_prompt : $self->chat_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");
+				LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
 			} else {
 				for (@{$self->{talklist}}) {
-					$self->send_talks($_, $rawline);
+					if ($self->{state} eq 'talk') {
+						$self->send_talks($_, $rawline);
+					} else {
+						send_chats($self, $_, $rawline);
+					}
 				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
+			$self->send($self->chat_prompt) if $self->{state} eq 'chat';
 		} else {
 			# for safety
 			$self->state('prompt');
@@ -341,7 +385,7 @@ sub normal
 
 	# check for excessive swearing
 	if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
-		Log('DXCommand', "$self->{call} logged out for excessive swearing");
+		LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
 		$self->disconnect;
 		return;
 	}
@@ -357,11 +401,11 @@ sub send_talks
 	
 	my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
 	$to = $ent unless $to;
-	my $call = $via ? $via : $to;
+	my $call = $via && $via ne '*' ? $via : $to;
 	my $clref = Route::get($call);
 	my $dxchan = $clref->dxchan if $clref;
 	if ($dxchan) {
-		$dxchan->talk($self->{call}, $to, $via, $line);
+		$dxchan->talk($self->{call}, $to, undef, $line);
 	} else {
 		$self->send($self->msg('disc2', $via ? $via : $to));
 		my @l = grep { $_ ne $ent } @{$self->{talklist}};
@@ -374,16 +418,40 @@ sub send_talks
 	}
 }
 
-sub talk_prompt
+sub send_chats
+{
+	my $self = shift;
+	my $target = shift;
+	my $text = shift;
+
+	my $msgid = DXProt::nextchatmsgid();
+	$text = "#$msgid $text";
+	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text));
+}
+
+sub special_prompt
 {
 	my $self = shift;
+	my $prompt = shift;
 	my @call;
 	for (@{$self->{talklist}}) {
 		my ($to, $via) = /(\S+)>(\S+)/;
 		$to = $_ unless $to;
 		push @call, $to;
 	}
-	return $self->msg('talkprompt', join(',', @call));
+	return $self->msg($prompt, join(',', @call));
+}
+
+sub talk_prompt
+{
+	my $self = shift;
+	return $self->special_prompt('talkprompt');
+}
+
+sub chat_prompt
+{
+	my $self = shift;
+	return $self->special_prompt('chatprompt');
 }
 
 #
@@ -415,6 +483,7 @@ sub send_ans
 		}
 	} 
 }
+
 # 
 # this is the thing that runs the command, it is done like this for the 
 # benefit of remote command execution
@@ -428,18 +497,22 @@ sub run_cmd
 	my $cmdline = shift;
 	my @ans;
 	
-
 	return () if length $cmdline == 0;
-		
+	
 	# 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) {
+
+		# check cmd
+		if ($cmd =~ m|^/| || $cmd =~ m|[^-?\w/]|) {
+			LogDbg('DXCommand', "cmd: invalid characters in '$cmd'");
+			return $self->_error_out('e1');
+		}
+
 		# strip out // on command only
 		$cmd =~ s|//|/|g;
-		$cmd =~ s|^/||g;		# no leading / either
-		$cmd =~ s|[^-?\w/]||g;		# and no funny characters either
 					
 		my ($path, $fcmd);
 			
@@ -450,7 +523,7 @@ sub run_cmd
 		if ($acmd) {
 			($cmd, $args) = split /\s+/, "$acmd $args", 2;
 			$args = "" unless defined $args;
-			dbg("aliased cmd: $cmd $args") if isdbg('command');
+			dbg("cmd: aliased $cmd $args") if isdbg('command');
 		}
 			
 		# first expand out the entry to a command
@@ -458,26 +531,23 @@ sub run_cmd
 		($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
 
 		if ($path && $cmd) {
-			dbg("path: $cmd cmd: $fcmd") if isdbg('command');
+			dbg("cmd: path $cmd cmd: $fcmd") if isdbg('command');
 			
 			my $package = find_cmd_name($path, $fcmd);
 			return ($@) if $@;
 				
-			if ($package) {
+			if ($package && DXCommandmode->can($package)) {
 				no strict 'refs';
-				dbg("package: $package") if isdbg('command');
+				dbg("cmd: package $package") if isdbg('command');
 				eval { @ans = &$package($self, $args) };
 				return (DXDebug::shortmess($@)) if $@;
+			} else {
+				dbg("cmd: $package not present") if isdbg('command');
+				return $self->_error_out('e1');
 			}
 		} 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'));
-			}
+			return $self->_error_out('e1');
 		}
 	}
 	
@@ -485,7 +555,7 @@ sub run_cmd
 	if ($ok) {
 		delete $self->{errors};
 	} else {
-		if (++$self->{errors} > $maxerrors) {
+		if (++$self->{errors} > $DXChannel::maxerrors) {
 			$self->send($self->msg('e26'));
 			$self->disconnect;
 			return ();
@@ -525,6 +595,8 @@ sub process
 			delete $nothereslug{$k};
 		}
 	}
+
+	import_cmd();
 }
 
 #
@@ -542,11 +614,14 @@ sub disconnect
 	my $uref = Route::User::get($call);
 	my @rout;
 	if ($uref) {
-		@rout = $main::routeroot->del_user($uref);
+#		@rout = $main::routeroot->del_user($uref);
+		@rout = DXProt::_del_thingy($main::routeroot, [$call, 0]);
+
 		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);
+		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes;
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -556,8 +631,9 @@ sub disconnect
 		
 	# send info to all logged in thingies
 	$self->tell_login('logoutu');
+	$self->tell_buddies('logoutb');
 
-	Log('DXCommand', "$call disconnected");
+	LogDbg('DXCommand', "$call disconnected");
 
 	$self->SUPER::disconnect;
 }
@@ -569,6 +645,9 @@ sub disconnect
 sub prompt
 {
 	my $self = shift;
+
+	return if $self->{gtk};		# 'cos prompts are not a concept that applies here
+	
 	my $call = $self->call;
 	my $date = cldate($main::systime);
 	my $time = ztime($main::systime);
@@ -752,24 +831,37 @@ sub find_cmd_name {
 		no strict 'refs';
 
 		if (exists $Cache{$package}) {
-			dbg("Redefining $package") if isdbg('command');
+			dbg("find_cmd_name: Redefining $package") if isdbg('command');
 			undef *$package;
 		} else {
-			dbg("Defining $package") if isdbg('command');
+			dbg("find_cmd_name: Defining $package") if isdbg('command');
 		}
+
 		eval $eval;
-		
-		$Cache{$package} = {mtime => $mtime };
+
+		$Cache{$package} = {mtime => $mtime } unless $@;
 	    
 	}
 
 	return $package;
 }
 
+sub send
+{
+	my $self = shift;
+	if ($self->{gtk}) {
+		for (@_) {
+			$self->SUPER::send(dd(['cmd',$_]));
+		}
+	} else {
+		$self->SUPER::send(@_);
+	}
+}
+
 sub local_send
 {
 	my ($self, $let, $buf) = @_;
-	if ($self->{state} eq 'prompt' || $self->{state} eq 'talk') {
+	if ($self->{state} eq 'prompt' || $self->{state} eq 'talk' || $self->{state} eq 'chat') {
 		if ($self->{enhanced}) {
 			$self->send_later($let, $buf);
 		} else {
@@ -783,10 +875,16 @@ sub local_send
 # send a talk message here
 sub talk
 {
-	my ($self, $from, $to, $via, $line) = @_;
+	my ($self, $from, $to, $via, $line, $onode) = @_;
 	$line =~ s/\\5E/\^/g;
-	$self->local_send('T', "$to de $from: $line") if $self->{talk};
-	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	if ($self->{talk}) {
+		if ($self->{gtk}) {
+			$self->local_send('T', dd(['talk',$to,$from,$via,$line]));
+		} else {
+			$self->local_send('T', "$to de $from: $line");
+		}
+	}
+	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
 	# send a 'not here' message if required
 	unless ($self->{here} && $from ne $to) {
 		my $key = "$to$from";
@@ -827,9 +925,14 @@ sub announce
 		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};
+	my $buf;
+	if ($self->{gtk}) {
+		$buf = dd(['ann', $to, $target, $text, @_])
+	} else {
+		$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);
 }
 
@@ -847,9 +950,14 @@ sub chat
 	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};
+	my $buf;
+	if ($self->{gtk}) {
+		$buf = dd(['chat', $to, $target, $text, @_])
+	} else {
+		$buf = "$target de $_[0]: $text";
+		$buf =~ s/\%5E/^/g;
+		$buf .= "\a\a" if $self->{beep};
+	}
 	$self->local_send('C', $buf);
 }
 
@@ -860,10 +968,10 @@ sub format_dx_spot
 	my $t = ztime($_[2]);
 	my $loc = '';
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
-	my $comment = substr $_[3], 0, $clth; 
+	my $comment = substr (($_[3] || ''), 0, $clth);
 	$comment .= ' ' x ($clth - length($comment));
-	if ($self->{user}->wantgrid) { 
-		my $ref = DXUser->get_current($_[4]);
+	if ($self->{user}->wantgrid) {
+		my $ref = DXUser::get_current($_[4]);
 		if ($ref) {
 			$loc = $ref->qra || '';
 			$loc = ' ' . substr($loc, 0, 4) if $loc;
@@ -904,6 +1012,24 @@ sub dx_spot
 	my $buf;
 	if ($self->{ve7cc}) {
 		$buf = VE7CC::dx_spot($self, @_);
+	} elsif ($self->{gtk}) {
+		my ($dxloc, $byloc);
+
+		my $ref = DXUser::get_current($_[4]);
+		if ($ref) {
+			$byloc = $ref->qra;
+			$byloc = substr($byloc, 0, 4) if $byloc;
+		}
+
+		my $spot = $_[1];
+		$spot =~ s|/\w{1,4}$||;
+		$ref = DXUser::get_current($spot);
+		if ($ref) {
+			$dxloc = $ref->qra;
+			$dxloc = substr($dxloc, 0, 4) if $dxloc;
+		}
+		$buf = dd(['dx', @_, ($dxloc||''), ($byloc||'')]);
+		
 	} else {
 		$buf = $self->format_dx_spot(@_);
 		$buf .= "\a\a" if $self->{beep};
@@ -927,8 +1053,14 @@ sub wwv
 		return unless $filter;
 	}
 
-	my $buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
-	$buf .= "\a\a" if $self->{beep};
+	my $buf;
+	if ($self->{gtk}) {
+		$buf = dd(['wwv', @_])
+	} else {
+		$buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
+		$buf .= "\a\a" if $self->{beep};
+	}
+	
 	$self->local_send('V', $buf);
 }
 
@@ -946,8 +1078,13 @@ sub wcy
 		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};
+	my $buf;
+	if ($self->{gtk}) {
+		$buf = dd(['wcy', @_])
+	} else {
+		$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);
 }
 
@@ -958,7 +1095,11 @@ sub broadcast_debug
 	
 	foreach my $dxchan (DXChannel::get_all) {
 		next unless $dxchan->{enhanced} && $dxchan->{senddbg};
-		$dxchan->send_later('L', $s);
+		if ($dxchan->{gtk}) {
+			$dxchan->send_later('L', dd(['db', $s]));
+		} else {
+			$dxchan->send_later('L', $s);
+		}
 	}
 }
 
@@ -1011,5 +1152,79 @@ sub store_startup_script
 	return @out;
 }
 
+# Import any commands contained in any files in import_cmd directory
+#
+# If the filename has a recogisable callsign as some delimited part
+# of it, then this is the user the command will be run as. 
+#
+sub import_cmd
+{
+	# are there any to do in this directory?
+	return unless -d $cmdimportdir;
+	unless (opendir(DIR, $cmdimportdir)) {
+		LogDbg('err', "can\'t open $cmdimportdir $!");
+		return;
+	} 
+
+	my @names = readdir(DIR);
+	closedir(DIR);
+	my $name;
+	foreach $name (@names) {
+		next if $name =~ /^\./;
+
+		my $s = Script->new($name, $cmdimportdir);
+		if ($s) {
+			LogDbg('DXCommand', "Run import cmd file $name");
+			my @cat = split /[^A-Za-z0-9]+/, $name;
+			my ($call) = grep {is_callsign(uc $_)} @cat;
+			$call ||= $main::mycall;
+			$call = uc $call;
+			my @out;
+			
+			
+			$s->inscript(0);	# switch off script checks
+			
+			if ($call eq $main::mycall) {
+				@out = $s->run($main::me, 1);
+			} else {
+				my $dxchan = DXChannel::get($call);
+			    if ($dxchan) {
+					@out = $s->run($dxchan, 1);
+				} else {
+					my $u = DXUser::get($call);
+					if ($u) {
+						$dxchan = $main::me;
+						my $old = $dxchan->{call};
+						my $priv = $dxchan->{priv};
+						my $user = $dxchan->{user};
+						$dxchan->{call} = $call;
+						$dxchan->{priv} = $u->priv;
+						$dxchan->{user} = $u;
+						@out = $s->run($dxchan, 1);
+						$dxchan->{call} = $call;
+						$dxchan->{priv} = $priv;
+						$dxchan->{user} = $user;
+					} else {
+						LogDbg('err', "Trying to run import cmd for non-existant user $call");
+					}
+				}
+			}
+			$s->erase;
+			for (@out) {
+				LogDbg('DXCommand', "Import cmd $name/$call: $_");
+			}
+		} else {
+			LogDbg('err', "Failed to open $cmdimportdir/$name $!");
+			unlink "$cmdimportdir/$name";
+		}
+	}
+}
+
+sub print_find_reply
+{
+	my ($self, $node, $target, $flag, $ms) = @_;
+	my $sort = $flag == 2 ? "External" : "Local";
+	$self->send("$sort $target found at $node in $ms ms" );
+}
 1;
 __END__