X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=510adac255f8a7caa397d1f88daf866f2057569d;hb=5756741d9682667ae5b0442c4e6f609bd481b6eb;hp=08b28acd3298b81d3ec7e644dd387aa70977698e;hpb=6d0ecd3545795aecacff640efc5ccc4e01be892b;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 08b28acd..510adac2 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -45,10 +45,12 @@ 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
-	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir $users $maxusers);
+	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir $users $maxusers
+);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -73,14 +75,15 @@ sub new
 	# 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::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->hostname], );
+	#	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	my $ipaddr = alias_localhost($self->hostname);
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $ipaddr], );
 
-	# ALWAYS output the user
+	# ALWAYS output the user (except if the updates not enabled)
 	my $ref = Route::User::get($call);
 	if ($ref) {
 		$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref);
-		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes;
+		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes || ! $DXProt::pc92_ad_enable;
 	}
 
 	return $self;
@@ -105,13 +108,15 @@ sub start
 
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
+	$self->send("Capabilities: ve7cc rbn");
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
 	$self->{priv} = $user->priv || 0;
 	$self->{lang} = $user->lang || $main::lang || 'en';
 	my $pagelth = $user->pagelth;
 	$pagelth = $default_pagelth unless defined $pagelth;
 	$self->{pagelth} = $pagelth;
-	($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
+	($self->{width}) = $line =~ /\s*width=(\d+)/; $line =~ s/\s*width=\d+//;
+	$self->{enhanced} = $line =~ /\s+enhanced/; $line =~ s/\s*enhanced//;
 	if ($line =~ /host=/) {
 		my ($h) = $line =~ /host=(\d+\.\d+\.\d+\.\d+)/;
 		$line =~ s/\s*host=\d+\.\d+\.\d+\.\d+// if $h;
@@ -124,7 +129,7 @@ sub start
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
 
-	LogDbg('DXCommand', "$call connected from $self->{hostname}");
+	LogDbg('DXCommand', "$call connected from $self->{hostname} cols $self->{width}" . ($self->{enhanced}?" enhanced":''));
 
 	# set some necessary flags on the user if they are connecting
 	$self->{beep} = $user->wantbeep;
@@ -140,31 +145,31 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 	$self->{lastmsgpoll} = 0;
-
+	$self->{rbnseeme} = $user->rbnseeme;
+	RBN::add_seeme($call) if $self->{rbnseeme};
+	
 	# sort out new dx spot stuff
 	$user->wantdxcq(0) unless defined $user->{wantdxcq};
 	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
 	$user->wantusstate(0) unless defined $user->{wantusstate};
-
+	
 	# sort out registration
-	if ($main::reqreg == 1) {
-		$self->{registered} = $user->registered;
-	} elsif ($main::reqreg == 2) {
+	if ($main::reqreg == 2) {
 		$self->{registered} = !$user->registered;
 	} else {
-		$self->{registered} = 1;
-	}
+		$self->{registered} = $user->registered;
+	} 
 
 	# 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} > 0 || $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;
 
 	# sort out privilege reduction
-	$self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
+	$self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->conn->peerhost eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
 
 	# get the filters
 	my $nossid = $call;
@@ -205,6 +210,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;
@@ -251,6 +261,7 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+	my @bad;
 
 	# save this for them's that need it
 	my $rawline = $cmdline;
@@ -259,7 +270,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;
 		
@@ -270,7 +281,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);
@@ -337,15 +348,14 @@ sub normal
 		} elsif ($cmdline =~ m|^/+\w+|) {
 			$cmdline =~ s|^/||;
 			my $sendit = $cmdline =~ s|^/+||;
-			my @in = $self->run_cmd($cmdline);
-			$self->send_ans(@in);
-			if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
-				foreach my $l (@in) {
-					my @bad;
-					if (@bad = BadWords::check($l)) {
-						$self->badcount(($self->badcount||0) + @bad);
-						LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
-					} else {
+			if (@bad = BadWords::check($cmdline)) {
+				$self->badcount(($self->badcount||0) + @bad);
+				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+			} else {
+				my @in = $self->run_cmd($cmdline);
+				$self->send_ans(@in);
+				if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+					foreach my $l (@in) {
 						for (@{$self->{talklist}}) {
 							if ($self->{state} eq 'talk') {
 								$self->send_talks($_, $l);
@@ -359,10 +369,9 @@ sub normal
 			$self->send($self->{state} eq 'talk' ? $self->talk_prompt : $self->chat_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
-			my @bad;
 			if (@bad = BadWords::check($cmdline)) {
 				$self->badcount(($self->badcount||0) + @bad);
-				LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
+				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
 			} else {
 				for (@{$self->{talklist}}) {
 					if ($self->{state} eq 'talk') {
@@ -394,11 +403,16 @@ sub normal
 		}
 		$self->send_ans(@ans);
 	} else {
-		$self->send_ans(run_cmd($self, $cmdline));
+#		if (@bad = BadWords::check($cmdline)) {
+#			$self->badcount(($self->badcount||0) + @bad);
+#			LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+#		} else {
+			$self->send_ans(run_cmd($self, $cmdline));
+#		}
 	} 
 
 	# check for excessive swearing
-	if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
+	if ($maxbadcount && $self->{badcount} && $self->{badcount} >= $maxbadcount) {
 		LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
 		$self->disconnect;
 		return;
@@ -440,7 +454,8 @@ sub send_chats
 
 	my $msgid = DXProt::nextchatmsgid();
 	$text = "#$msgid $text";
-	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text));
+	my $ipaddr = alias_localhost($self->hostname || '127.0.0.1');
+	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text, undef, $ipaddr));
 }
 
 sub special_prompt
@@ -553,6 +568,7 @@ sub run_cmd
 			if ($package && $self->can("${package}::handle")) {
 				no strict 'refs';
 				dbg("cmd: package $package") if isdbg('command');
+#				Log('cmd', "$self->{call} on $self->{hostname} : '$cmd $args'");
 				my $t0 = [gettimeofday];
 				eval { @ans = &{"${package}::handle"}($self, $args) };
 				if ($@) {
@@ -642,6 +658,7 @@ sub disconnect
 	return if $self->{disconnecting}++;
 
 	delete $self->{senddbg};
+	RBN::del_seeme($call);
 
 	my $uref = Route::User::get($call);
 	my @rout;
@@ -649,11 +666,11 @@ sub disconnect
 #		@rout = $main::routeroot->del_user($uref);
 		@rout = DXProt::_del_thingy($main::routeroot, [$call, 0]);
 
-		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+		# dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
 
 		# issue a pc17 to everybody interested
 		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
-		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes;
+		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes || ! $DXProt::pc92_ad_enable;
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -1006,40 +1023,66 @@ sub format_dx_spot
 	my $self = shift;
 
 	my $t = ztime($_[2]);
-	my $loc = '';
-	my $clth = 31 + $self->{width} - 80;    # allow comment to grow according the screen width 
-	#	--$clth if $self->{consort} eq 'local';
-	
-	my $comment = substr (($_[3] || ''), 0, $clth);
-	$comment =~ s/\t/ /g;
+	my ($slot1, $slot2) = ('', '');
 	
+	my $clth = 30 + $self->{width} - 80;    # allow comment to grow according the screen width 
+	my $c = $_[3];
+	$c =~ s/\t/ /g;
+	my $comment = substr (($c || ''), 0, $clth);
 	$comment .= ' ' x ($clth - (length($comment)));
 	
-    if ($self->{user}->wantgrid) {
+    if (!$slot1 && $self->{user}->wantgrid) {
 		my $ref = DXUser::get_current($_[1]);
 		if ($ref && $ref->qra) {
-			my $cloc = ' ' . substr($ref->qra, 0, 4);
-			$comment = substr $comment, 0,  ($clth - (length($comment)+length($cloc)));
-			$comment .= $cloc;
+			$slot1 = ' ' . substr($ref->qra, 0, 4);
+		}
+	}
+	if (!$slot1 && $self->{user}->wantusstate) {
+		$slot1 = " $_[12]" if $_[12];
+	}
+	unless ($slot1) {
+		if ($self->{user}->wantdxitu) {
+			$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
+		} elsif ($self->{user}->wantdxcq) {
+			$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
 		}
+	}
+	$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
+	
+    if (!$slot2 && $self->{user}->wantgrid) {
 		my $origin = $_[4];
 		$origin =~ s/-#$//;			# sigh......
-		$ref = DXUser::get_current($origin);
+		my $ref = DXUser::get_current($origin);
 		if ($ref && $ref->qra) {
-			$loc = ' ' . substr($ref->qra, 0, 4);
+			$slot2 = ' ' . substr($ref->qra, 0, 4);
+		}
+	}
+	if (!$slot2 && $self->{user}->wantusstate) {
+		$slot2 = " $_[13]" if $_[13];
+	}
+	unless ($slot2) {
+		if ($self->{user}->wantdxitu) {
+			$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
+		} elsif ($self->{user}->wantdxcq) {
+			$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
 		}
-	} elsif ($self->{user}->wantdxitu) {
-		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
-		$comment = substr($comment, 0,  $clth-3) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
-	} elsif ($self->{user}->wantdxcq) {
-		$loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
-		$comment = substr($comment, 0, $clth-3) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
-	} elsif ($self->{user}->wantusstate) {
-		$loc = ' ' . $_[13] if $_[13];
-		$comment = substr($comment, 0,  $clth-3) . ' ' . $_[12] if $_[12]; 
 	}
 
-	return sprintf "DX de %-9.9s%9.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+	my $o = sprintf("%-9s", $_[4] . ':');
+	my $qrg = sprintf "%8.1f", $_[0];
+	if (length $qrg >= 9) {
+		while (length($o)+length($qrg) > 17 && $o =~ / $/) {
+			chop $o;
+		}
+	}
+	my $spot = sprintf "%-12s", $_[1];
+	my $front = "DX de $o $qrg  $spot";
+	while (length($front) > 38 && $front =~ /  $/) {
+		chop $front;
+	}
+
+	
+	return sprintf "$front %-s $t$slot2", $comment;
 }
 
 
@@ -1287,7 +1330,7 @@ sub send_motd
 	my $self = shift;
 	my $motd;
 
-	unless ($self->{registered}) {
+	unless ($self->isregistered) {
 		$motd = "${main::motd}_nor_$self->{lang}";
 		$motd = "${main::motd}_nor" unless -e $motd;
 	}
@@ -1303,7 +1346,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
@@ -1396,7 +1438,23 @@ sub spawn_cmd
 
 sub user_count
 {
-	return ($users, $maxusers);
+    return ($users, $maxusers);
+}
+
+# alias localhost if required. This is designed to repress all localhost and other
+# internal interfaces to a fixed (outside) IPv4 or IPV6 address
+sub alias_localhost
+{
+	my $hostname = shift;
+	if ($hostname =~ /./) {
+		return $hostname unless $main::localhost_alias_ipv4;
+		return (grep $hostname eq $_, @main::localhost_names) ? $main::localhost_alias_ipv4 : $hostname;
+	} elsif ($hostname =~ /:/) {
+		return $hostname unless $main::localhost_alias_ipv6;
+		return (grep $hostname eq $_, @main::localhost_names) ? $main::localhost_alias_ipv6 : $hostname;
+	}
+	return $hostname;
 }
+
 1;
 __END__