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

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 197288d5..9dc967b6 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -30,16 +30,16 @@ use AnnTalk;
 use WCY;
 use Sun;
 use Internet;
-use IO::File;
 
 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
@@ -48,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;
 }
 
@@ -98,21 +105,12 @@ 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;
@@ -222,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);
@@ -352,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);
 }
 
@@ -392,24 +405,22 @@ sub disconnect
 
 	# reset the redirection of messages back to 'normal' if we are the sysop
 	if ($call eq $main::myalias) {
-		my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
-		$node->dxchan($DXProt::me);
+		$DXProt::me->conn(undef);
 	}
 
+	my @rout = $main::routeroot->del_user($call);
+	dbg('route', "B/C PC17 on $main::mycall for: $call");
+
+	# issue a pc17 to everybody interested
+	DXProt::route_pc17($DXProt::me, $main::routeroot, @rout) if @rout;
+
 	# I was the last node visited
     $self->user->node($main::mycall);
 		
-	# issue a pc17 to everybody interested
-	my $nchan = DXChannel->get($main::mycall);
-	my $pc17 = $nchan->pc17($self);
-	DXProt::broadcast_all_ak1a($pc17);
-
 	# 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;
 }