X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=c9b49182d09f9965c7174e295bd833649f514525;hb=309eea6bcd4a0eaf25f810168bc38dc348c2a982;hp=1e8200d2e0d03949a4d46dd1b209ab5d9c54e0a9;hpb=83445c4f6ec6c885260944a9abe648aced399c40;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1e8200d2..c9b49182 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -13,6 +13,7 @@
 package main;
 
 require 5.10.1;
+
 use warnings;
 
 use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
@@ -33,17 +34,22 @@ $user_interval = 11*60;			# the interval between unsolicited prompts if no traff
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
-
+	$SIG{'__WARN__'} = sub { warn $_[0] if $DOWARN };
+			
 	# take into account any local::lib that might be present
 	eval {
 		require local::lib;
 	};
-	import local::lib unless ($@);
+	unless ($@) {
+#		import local::lib;
+		import local::lib qw(/spider/perl5lib);
+	} 
 
 	# root of directory tree for this system
 	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+	unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
@@ -87,9 +93,10 @@ BEGIN {
 use DXVars;
 use SysVar;
 
-use strict;
-
+# order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log
+use Mojolicious 7.26;
 use Mojo::IOLoop;
+$DOWARN = 1;
 
 use DXDebug;
 use Msg;
@@ -143,14 +150,19 @@ use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
+use RBN;
+
 
 use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
 use POSIX ":sys_wait_h";
-use Version;
 use Web;
 
+use vars qw($version $build $gitversion $gitbranch);
+
+use strict;
+
 use Local;
 
 
@@ -161,6 +173,16 @@ $starttime = 0;                 # the starting time of the cluster
 @listeners = ();				# list of listeners
 $reqreg = 0;					# 1 = registration required, 2 = deregister people
 $bumpexisting = 1;				# 1 = allow new connection to disconnect old, 0 - don't allow it
+our $allowmultiple = 0;				# This is used in conjunction with $bumpexisting, in a rather weird way.
+our $min_reconnection_rate = 5*60;		# minimum value of seconds between connections per user to allow co-existing users
+our $max_ssid = 15;					# highest ssid to be searched for a spare one on multiple connections
+
+# If $allowmultiple > 0 and the $reconnection_rate is some value of seconds
+# based on the average connection time calculated from the $user->conntimel entries / frequency is
+# less than $reconnection_rate then we assume that there is more than one device (probably HRD) trying
+# to connect "at once". In which case we probe for a spare SSID for a user callsign to allow up to 
+# $allowmultiple connections per callsign. 
+
 $allowdxby = 0;					# 1 = allow "dx by <othercall>", 0 - don't allow it
 $maxconnect_user = 3;			# the maximum no of concurrent connections a user can have at a time
 $maxconnect_node = 0;			# Ditto but for nodes. In either case if a new incoming connection
@@ -173,6 +195,7 @@ our $ending;					# signal that we are ending;
 our $broadcast_debug;			# allow broadcasting of debug info down "enhanced" user connections
 our $clssecs;					# the amount of cpu time the DXSpider process have consumed
 our $cldsecs;					# the amount of cpu time any child processes have consumed
+our $allowslashcall;			# Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) 
 
 
 # send a message to call on conn and disconnect
@@ -215,6 +238,7 @@ sub new_channel
 			$user->long($main::mylongitude);
 			$user->qra($main::mylocator);
 		}
+		$user->startt($main::systime);	
 		$conn->conns($call);
 		$dxchan = Web->new($call, $conn, $user);
 		$dxchan->enhanced(1);
@@ -228,27 +252,81 @@ sub new_channel
 			return;
 		}
 
+		# is he locked out ?
+		my $lock;
+		$user = DXUser::get_current($call);
+		$conn->conns($call);
+		my $basecall = $call;
+		$basecall =~ s/-\d+$//;	# remember this for later multiple user processing, it's used for other stuff than checking lockout status
+		if ($user) {
+			# make sure we act on any locked status that the actual incoming call has.
+			$lock = $user->lockout;
+		} elsif ($basecall ne $call) {
+			# if there isn't a SSID on the $call, then try the base
+			$user = DXUser::get_current($basecall);
+			$lock = $user->lockout if $user;
+		}
+
+		# now deal with the lock
+		if ($lock) {
+			my $host = $conn->peerhost;
+			LogDbg('', "$call on $host is locked out, disconnected");
+			$conn->disconnect;
+			return;
+		}
+
 		# set up the basic channel info for "Normal" Users
 		# is there one already connected to me - locally?
-	
-		$user = DXUser::get_current($call);
+
 		$dxchan = DXChannel::get($call);
+		my $newcall = $call;
 		if ($dxchan) {
 			if ($user && $user->is_node) {
 				already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
 				return;
 			}
-			if ($bumpexisting) {
-				my $ip = $dxchan->hostname;
-				$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
-				LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
-				$dxchan->disconnect;
-			} else {
-				already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
-				return;
+			if ($allowmultiple && $user->is_user) {
+				# determine whether we are a candidate, have we flip-flopped frequently enough?
+				my @lastconns = @{$user->connlist} if $user->connlist;
+				my $allow = 0;
+				if (@lastconns >= $DXUser::maxconnlist) {
+					$allow = $lastconns[-1]->[0] - $lastconns[0]->[0] < $min_reconnection_rate;
+				} 
+				# search for a spare ssid
+			L1:	for (my $count = $call =~ /-\d+$/?0:1; $allow && $count < $allowmultiple; ) { # remember we have one call already
+					my $lastid = 1;
+					for (; $lastid < $max_ssid && $count < $allowmultiple; ++$lastid) {
+						my $chan = DXChannel::get("$basecall-$lastid");
+						if ($chan) {
+							++$count;
+							next;
+						}
+						# we have a free call-ssid, save it
+						$newcall = "$basecall-$lastid";
+						last L1;
+					}
+				}
+			}
+
+			# handle "normal" (non-multiple) connections in the existing way
+			if ($call eq $newcall) {
+				if ($bumpexisting) {
+					my $ip = $dxchan->hostname;
+					$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
+					LogDbg('', "$call bumped off by $ip, disconnected");
+					$dxchan->disconnect;
+				} else {
+					already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+					return;
+				}
 			}
+
+			# make sure that the conn has the (possibly) new callsign
+			$conn->conns($newcall);
+			$msg =~ s/$call/$newcall/;
 		}
-		
+
+
 		# (fairly) politely disconnect people that are connected to too many other places at once
 		my $r = Route::get($call);
 		if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
@@ -257,28 +335,14 @@ sub new_channel
 			my $c = $user->maxconnect;
 			my $v;
 			$v = defined $c ? $c : $m;
-			if ($v && @n >= $v) {
+			if ($v && @n >= $v+$allowmultiple) {
 				my $nodes = join ',', @n;
-				LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
+				LogDbg('', "$call has too many connections ($v) at $nodes - disconnected");
 				already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
 				return;
 			}
 		}
 		
-		# is he locked out ?
-		my $basecall = $call;
-		$basecall =~ s/-\d+$//;
-		my $baseuser = DXUser::get_current($basecall);
-		my $lock = $user->lockout if $user;
-		if ($baseuser && $baseuser->lockout || $lock) {
-			if (!$user || !defined $lock || $lock) {
-				my $host = $conn->peerhost;
-				LogDbg('DXCommand', "$call on $host is locked out, disconnected");
-				$conn->disconnect;
-				return;
-			}
-		}
-
 		if ($user) {
 			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 		} else {
@@ -286,21 +350,23 @@ sub new_channel
 		}
 
 		# create the channel
+		# NOTE we are SHARING the same $user if $allowmultiple is > 1
+		
+		$user->startt($systime); # mark the start time of this connection
 		if ($user->is_node) {
-			$dxchan = DXProt->new($call, $conn, $user);
+			$dxchan = DXProt->new($call, $conn, $user);	
+		} elsif ($user->is_rbn) {
+			$dxchan = RBN->new($newcall, $conn, $user);
 		} elsif ($user->is_user) {
-			$dxchan = DXCommandmode->new($call, $conn, $user);
+			$dxchan = DXCommandmode->new($newcall, $conn, $user);
 		} else {
 			die "Invalid sort of user on $call = $sort";
 		}
-		
-		# check that the conn has a callsign
-		$conn->conns($call) if $conn->isa('IntMsg');
 	}
 	
 
 	# set callbacks
-	$conn->set_error(sub {my $err = shift; LogDbg('DXCommand', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
+	$conn->set_error(sub {my $err = shift; LogDbg('', "Comms error '$err' received for call $dxchan->{call}"); $dxchan->disconnect(1);});
 	$conn->set_on_eof(sub {$dxchan->disconnect});
 	$conn->set_rproc(sub {my ($conn,$msg) = @_; $dxchan->rec($msg);});
 	if ($sort eq 'W') {
@@ -332,7 +398,6 @@ sub cease
 		$SIG{'INT'} = 'IGNORE';
 	}
 
-	DXUser::sync;
 
 	if (defined &Local::finish) {
 		eval {
@@ -350,6 +415,7 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	RBN::finish();
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -361,7 +427,7 @@ sub cease
 		$l->close_server;
 	}
 
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) ended");
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
 	dbg("bye bye everyone - bye bye");
 	dbgclose();
 	Logclose();
@@ -422,12 +488,14 @@ sub setup_start
 	}
 
 	# open the debug file, set various FHs to be unbuffered
-	dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+	dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
 	foreach (@debug) {
 		dbgadd($_);
 	}
 	STDOUT->autoflush(1);
 
+	# log our path
+	dbg "Perl path: " . join(':', @INC);
 	
 	# try to load the database
 	if (DXSql::init($dsn)) {
@@ -445,6 +513,8 @@ sub setup_start
 			import Encode;
 			$can_encode = 1;
 		}
+		$gitbranch = 'none';
+		$gitversion = 'none';
 		eval { require Git; };
 		unless ($@) {
 			import Git;
@@ -455,10 +525,21 @@ sub setup_start
 				my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
 				if ($desc) {
 					my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+					$s ||= '';
+					dbg("Git: $desc") if isdbg('git');
+					dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
 					$version = $v;
 					$build = $b || 0;
 					$gitversion = "$g\[r]";
 				}
+				my @branch = $repo->command([qw{branch}], STDERR=>0);
+				for (@branch) {
+					my ($star, $b) = split /\s+/;
+					if ($star eq '*') {
+						$gitbranch = $b;
+						last;
+					}
+				}
 			}
 		}
 		$SIG{__DIE__} = $w;
@@ -470,7 +551,7 @@ sub setup_start
 	# banner
 	my ($year) = (gmtime)[5];
 	$year += 1900;
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) started");
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
 	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 	# load Prefixes
@@ -485,7 +566,10 @@ sub setup_start
 
 	# initialise User file system
 	dbg("loading user file system ...");
-	DXUser::init(1);
+	DXUser::init(4);			# version 4 == json format
+
+	Filter::init();				# doesn't do much, but has to be done
+	
 
 	# look for the sysop and the alias user and complain if they aren't there
 	{
@@ -495,14 +579,14 @@ sub setup_start
 		my $oldsort = $ref->sort;
 		if ($oldsort ne 'S') {
 			$ref->sort('S');
-			dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+			dbg("Resetting node type from $oldsort -> DXSpider ('S')");
 		}
 		$ref = DXUser::get($myalias);
 		die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 		$oldsort = $ref->sort;
 		if ($oldsort ne 'U') {
 			$ref->sort('U');
-			dbg "Resetting sysop user type from $oldsort -> User ('U')";
+			dbg("Resetting sysop user type from $oldsort -> User ('U')");
 		}
 	}
 
@@ -608,6 +692,9 @@ sub setup_start
 	dbg("reading database descriptors ...");
 	DXDb::load();
 
+	dbg("starting RBN ...");
+	RBN::init();
+
 	# starting local stuff
 	dbg("doing local initialisation ...");
 	QSL::init(1);
@@ -632,6 +719,8 @@ our $io_disconnected;
 sub idle_loop
 {
 	BPQMsg::process();
+#	DXCommandmode::process(); # process ongoing command mode stuff
+#	DXProt::process();		# process ongoing ak1a pcxx stuff
 
 	if (defined &Local::process) {
 		eval {
@@ -660,7 +749,7 @@ sub idle_loop
 			$main::me->disconnect;
 		}
 
-		Mojo::IOLoop->stop if --$ending <= 0;
+		Mojo::IOLoop->stop_gracefully if --$ending <= 0;
 	}
 }
 
@@ -676,22 +765,21 @@ sub per_sec
 		$systime_daystart = $days * 86400;
 	}
 	IsoTime::update($systime);
-	DXCron::process();      # do cron jobs
 	DXCommandmode::process(); # process ongoing command mode stuff
-	DXXml::process();
 	DXProt::process();		# process ongoing ak1a pcxx stuff
+	DXXml::process();
 	DXConnect::process();
 	DXMsg::process();
 	DXDb::process();
 	DXUser::process();
 	DXDupe::process();
-	DXCron::process();			# do cron jobs
 	IsoTime::update($systime);
-	DXProt::process();			# process ongoing ak1a pcxx stuff
 	DXConnect::process();
 	DXUser::process();
 	AGWMsg::process();
-	
+	DXCron::process();			# do cron jobs
+	RBN::process();
+
 	Timer::handler();
 	DXLog::flushall();
 }
@@ -701,20 +789,19 @@ sub per_10_sec
 
 }
 
-
 sub per_minute
 {
-
+	RBN::per_minute();
 }
 
 sub per_10_minute
 {
-
+	RBN::per_10_minute();
 }
 
 sub per_hour
 {
-
+	RBN::per_hour();
 }
 
 sub per_day