X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=1960a8905f36a4561e1a23a41790328c2f3088fa;hb=2b7e736fb36d7edc64930ce9a8acffb86257e3ed;hp=fda298b13e54ddf8e8fe3c333e47b2cc6550ce5c;hpb=a895f396222d99b306bbabe53dcb184131f7af2d;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index fda298b1..1960a890 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -45,6 +45,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
 use Mojo::IOLoop;
 use DXSubprocess;
 use Mojo::UserAgent;
+use DXCIDR;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
@@ -157,7 +158,7 @@ sub start
 	# establish slug queue, if required
 	$self->{sluggedpcs} = [];
 	$self->{isslugged} = $DXProt::pc92_slug_changes + $DXProt::last_pc92_slug + 5 if $DXProt::pc92_slug_changes;
-	$self->{isslugged} = 0 if $self->{priv} || $user->registered || $user->homenode eq $main::mycall;
+	$self->{isslugged} = 0 if $self->{priv} || $user->registered || ($user->homenode && $user->homenode eq $main::mycall);
 
 	# send the relevant MOTD
 	$self->send_motd;
@@ -204,6 +205,11 @@ sub start
 	
 	$self->tell_login('loginu');
 	$self->tell_buddies('loginb');
+
+	# is this a bad ip address?
+	if (is_ipaddr($self->{hostname})) {
+		$self->{badip} = DXCIDR::find($self->{hostname});
+	}
 	
 	# do we need to send a forward/opernam?
 	my $lastoper = $user->lastoper || 0;
@@ -258,7 +264,7 @@ sub normal
 	$cmdline =~ s/^\s*(.*)\s*$/$1/;
 	
 	if ($self->{state} eq 'page') {
-		my $i = $self->{pagelth};
+		my $i = $self->{pagelth}-5;
 		my $ref = $self->{pagedata};
 		my $tot = @$ref;
 		
@@ -269,7 +275,7 @@ sub normal
 		}
         
 		# send a tranche of data
-		while ($i-- > 0 && @$ref) {
+		for (; $i > 0 && @$ref; --$i) {
 			my $line = shift @$ref;
 			$line =~ s/\s+$//o;	# why am having to do this? 
 			$self->send($line);
@@ -1315,7 +1321,6 @@ sub send_motd
 	$self->send_file($motd) if -e $motd;
 }
 
-
 # Punt off a long running command into a separate process
 #
 # This is called from commands to run some potentially long running
@@ -1408,7 +1413,7 @@ sub spawn_cmd
 
 sub user_count
 {
-	return ($users, $maxusers);
+    return ($users, $maxusers);
 }
 
 1;