X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXCommandmode.pm;h=a8418bd4daf0af368947b188f8c30a534279f26d;hb=50f6466ca2dff82ca470a4abe327d741cffef61a;hp=ff173906bebef9945743b6e5eeb089bca430a886;hpb=08c06444bb706e557a28f08ae7984ba2852ae720;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ff173906..a8418bd4 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -30,6 +30,8 @@ use AnnTalk;
 use WCY;
 use Sun;
 use Internet;
+use Script;
+
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug);
@@ -59,7 +61,7 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::route_pc16($DXProt::me, $main::routeroot, @rout) if @rout;
+	DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
 
 	return $self;
 }
@@ -75,6 +77,10 @@ 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);
@@ -96,6 +102,7 @@ sub start
 	$self->{wx} = $user->wantwx;
 	$self->{dx} = $user->wantdx;
 	$self->{logininfo} = $user->wantlogininfo;
+	$self->{ann_talk} = $user->wantann_talk;
 	$self->{here} = 1;
 
 	# get the filters
@@ -113,18 +120,6 @@ sub start
 		$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
 	}
 
-	Log('DXCommand', "$call connected");
-
-	# send prompts and things
-	my $info = Route::cluster();
-	$self->send("Cluster:$info");
-	$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;
-
 	# decide on echo
 	if (!$user->wantecho) {
 		$self->send_now('E', "0");
@@ -137,9 +132,25 @@ sub start
 	my $lastoper = $user->lastoper || 0;
 	my $homenode = $user->homenode || ""; 
 	if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
-		run_cmd($DXProt::me, "forward/opernam $call");
+		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;
 }
 
 #
@@ -440,7 +451,7 @@ sub disconnect
 	}
 
 	# issue a pc17 to everybody interested
-	DXProt::route_pc17($DXProt::me, $main::routeroot, @rout) if @rout;
+	DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
 
 	# I was the last node visited
     $self->user->node($main::mycall);
@@ -701,6 +712,11 @@ sub announce
 	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;