X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=0f80232ac8432636ef1d65a6f9a0bf609672e960;hb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;hp=6e7a0944f5461c109d9b4a5d6a5106ba2092515b;hpb=3b3b52396a19281c24481f0fcf7d216f426f94d9;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 6e7a0944..0f80232a 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -32,13 +32,14 @@ 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
@@ -102,6 +103,11 @@ sub start
 	my $cuser = DXNodeuser->new($self, $node, $call, 0, 1);
 	$node->dxchan($self) if $call eq $main::myalias; # send all output for mycall to myalias
 
+	# routing version
+	my $pref = Route::Node::get($main::mycall)  or die "$main::mycall not allocated in Route database";
+	$pref->add_user($call, Route::here($self->{here}));
+	dbg('route', "B/C PC16 on $main::mycall for: $call");
+	
 	# issue a pc16 to everybody interested
 	my $nchan = DXChannel->get($main::mycall);
 	my @pc16 = DXProt::pc16($nchan, $cuser);
@@ -351,12 +357,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);
 }
 
@@ -395,6 +416,12 @@ sub disconnect
 		$node->dxchan($DXProt::me);
 	}
 
+	my $pref = Route::Node::get($main::mycall);
+	if ($pref) {
+		my @rout = $pref->del_user($main::mycall);
+		dbg('route', "B/C PC17 on $main::mycall for: $call");
+	}
+
 	# I was the last node visited
     $self->user->node($main::mycall);