X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=9dc967b6d1a85e43cc353fc64c8317d5d50ecc18;hb=95a03441d20680a914673d1b6bbf46c0d673ad4c;hp=4477ea75241f62b97a57167f30bf23dc470459c7;hpb=3ba1b48202f7053b4d1097525dc0a660c3f9b31a;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 4477ea75..9dc967b6 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -29,15 +29,17 @@ use DXDb;
 use AnnTalk;
 use WCY;
 use Sun;
+use Internet;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors);
 
 %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
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -46,6 +48,13 @@ $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));
+	DXProt::route_pc16($DXProt::me, $main::routeroot, @rout) if @rout;
+
 	return $self;
 }
 
@@ -65,7 +74,7 @@ sub start
 	$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->{consort} = $line;	# save the connection type
@@ -96,28 +105,19 @@ 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
+	$DXProt::me->conn($self->conn) 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($_);
-	}
 	Log('DXCommand', "$call connected");
 
 	# send prompts and things
-	my $info = DXCluster::cluster();
+	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->send($self->msg('pr', $call));
+	$self->prompt;
 
 	# decide on echo
 	if (!$user->wantecho) {
@@ -220,7 +220,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);
@@ -350,12 +350,27 @@ sub run_cmd
 				}
 			} else {
 				dbg('command', "cmd: $cmd not found");
-				return ($self->msg('e1'));
+				if (++$self->{errors} > $maxerrors) {
+					$self->send($self->msg('e26'));
+					$self->disconnect;
+					return ();
+				} else {
+					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);
 }
 
@@ -383,40 +398,31 @@ sub process
 #
 # 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);
+	# reset the redirection of messages back to 'normal' if we are the sysop
+	if ($call eq $main::myalias) {
+		$DXProt::me->conn(undef);
 	}
 
-#	if ($call eq $main::myalias) { # unset the channel if it is us really
-#		my $node = DXNode->get($main::mycall);
-#		$node->{dxchan} = 0;
-#	}
-	
+	my @rout = $main::routeroot->del_user($call);
+	dbg('route', "B/C PC17 on $main::mycall for: $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($DXProt::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");
-	my $ref = DXCluster->get_exact($call);
-	$ref->del() if $ref;
+
+	$self->SUPER::disconnect;
 }
 
 #
@@ -426,7 +432,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]