From: minima <minima>
Date: Tue, 11 Sep 2001 21:01:59 +0000 (+0000)
Subject: added IP address logging for connections
X-Git-Tag: R_1_48~28
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=765add8acca099e69f2b2cde2bb58a48a00852d3;p=spider.git

added IP address logging for connections
---

diff --git a/Changes b/Changes
index a34ac304..a2b0354d 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+11Sep01=======================================================================
+1. added IP address logging of connections
 10Sep01=======================================================================
 1. clear/* node_default and user_default now work.
 2. in acc or rej/* you can now use (comma separated) prefixes as well as lists
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 8a186e3c..ba2e0edc 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -74,16 +74,16 @@ $count = 0;
 		  group => '0,Access Group,parray',	# used to create a group of users/nodes for some purpose or other
 		  isolate => '5,Isolate network,yesno',
 		  delayed => '5,Delayed messages,parray',
-		  annfilter => '5,Announce Filter',
-		  wwvfilter => '5,WWV Filter',
-		  wcyfilter => '5,WCY Filter',
-		  spotsfilter => '5,Spot Filter',
-		  routefilter => '5,route Filter',
-		  inannfilter => '5,Input Ann Filter',
-		  inwwvfilter => '5,Input WWV Filter',
-		  inwcyfilter => '5,Input WCY Filter',
-		  inspotsfilter => '5,Input Spot Filter',
-		  inroutefilter => '5,Input Route Filter',
+		  annfilter => '5,Ann Filt-out',
+		  wwvfilter => '5,WWV Filt-out',
+		  wcyfilter => '5,WCY Filt-out',
+		  spotsfilter => '5,Spot Filt-out',
+		  routefilter => '5,Route Filt-out',
+		  inannfilter => '5,Ann Filt-inp',
+		  inwwvfilter => '5,WWV Filt-inp',
+		  inwcyfilter => '5,WCY Filt-inp',
+		  inspotsfilter => '5,Spot Filt-inp',
+		  inroutefilter => '5,Route Filt-inp',
 		  passwd => '9,Passwd List,parray',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ff173906..5e6c7226 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -75,6 +75,10 @@ sub start
 	my $call = $self->{call};
 	my $name = $user->{name};
 	
+	# log it
+	my $host = $self->{conn}->{peerhost} || "unknown";
+	Log('DXCommand', "$call connected from $host");
+
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
 	$self->send_file($main::motd) if (-e $main::motd);
@@ -113,8 +117,6 @@ sub start
 		$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
 	}
 
-	Log('DXCommand', "$call connected");
-
 	# send prompts and things
 	my $info = Route::cluster();
 	$self->send("Cluster:$info");
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f6a32cce..e78d9a7a 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -216,6 +216,10 @@ sub start
 	my ($self, $line, $sort) = @_;
 	my $call = $self->{call};
 	my $user = $self->{user};
+
+	# log it
+	my $host = $self->{conn}->{peerhost} || "unknown";
+	Log('DXProt', "$call connected from $host");
 	
 	# remember type of connection
 	$self->{consort} = $line;
@@ -267,8 +271,6 @@ sub start
 
 	# send info to all logged in thingies
 	$self->tell_login('loginn');
-
-	Log('DXProt', "$call connected");
 }
 
 #
diff --git a/perl/cluster.pl b/perl/cluster.pl
index aa95e7ac..516e7cb1 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -159,7 +159,8 @@ sub new_channel
 	
 	# is he locked out ?
 	if ($user->lockout) {
-		Log('DXCommand', "$call is locked out, disconnected");
+		my $host = $conn->{peerhost} || "unknown";
+		Log('DXCommand', "$call on $host is locked out, disconnected");
 		$conn->disconnect;
 		return;
 	}