X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b7f201bd483be32fb0d33d1a271b30b7d176b1a9;hb=e67d75717f0625225632cfd12a7a2d899fb692ea;hp=4222132c2b982bee9fe2490d99cab9ca184ab224;hpb=0a1faadbc2cee1d5aa3690ed7fa32dd7443ed83d;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4222132c..b7f201bd 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -15,10 +15,31 @@ package main;
 require 5.10.1;
 use warnings;
 
+use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects
+			$zombies @listeners $lang $myalias @debug $userfn $clusteraddr
+			$clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting
+			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
+			$can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
+			$broadcast_debug 
+		   );
+
+$lang = 'en';					# default language
+$clusteraddr = '127.0.0.1';		# cluster tcp host address - used for things like console.pl
+$clusterport = 27754;			# cluster tcp port
+$yes = 'Yes';					# visual representation of yes
+$no = 'No';						# ditto for no
+$user_interval = 11*60;			# the interval between unsolicited prompts if no traffic
+
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
 
+	# take into account any local::lib that might be present
+	eval {
+		require local::lib;
+	};
+	import local::lib unless ($@);
+
 	# root of directory tree for this system
 	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
@@ -32,8 +53,11 @@ BEGIN {
 	die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm";
 
 	# create some directories
-	mkdir "$root/local_cmd", 02777 unless -d "$root/local_cmd";
-	mkdir "$root/local_data", 02777 unless -d "$root/local_data";
+	mkdir "$root/local_cmd", 02774 unless -d "$root/local_cmd";
+
+	# locally stored data lives here
+	my $local_data = "$root/local_data";
+	mkdir $local_data, 02774 unless -d $local_data;
 
 	# try to create and lock a lockfile (this isn't atomic but
 	# should do for now
@@ -57,14 +81,20 @@ BEGIN {
 
 	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
 	$systime = time;
+	
 }
 
-			
-use Mojo::IOLoop;
-
 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 DXDebug;
+
+use Mojolicious 7.26;
+use Mojo::IOLoop;
+
 use Msg;
 use IntMsg;
 use Internet;
@@ -72,7 +102,6 @@ use Listeners;
 use ExtMsg;
 use AGWConnect;
 use AGWMsg;
-use DXDebug;
 use DXLog;
 use DXLogPrint;
 use DXUtil;
@@ -118,6 +147,8 @@ use DXSql;
 use IsoTime;
 use BPQMsg;
 
+
+
 use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
@@ -127,16 +158,6 @@ use Web;
 
 use Local;
 
-package main;
-
-use strict;
-use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
-			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
-			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
-			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
-			$can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
-			$broadcast_debug 
-		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
@@ -145,6 +166,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
@@ -178,85 +209,152 @@ sub new_channel
 	my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
 	return unless defined $sort;
 
-	unless (is_callsign($call)) {
-		already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
-		return;
-	}
-
-	# set up the basic channel info
-	# is there one already connected to me - locally?
-	my $user = DXUser::get_current($call);
-	my $dxchan = DXChannel::get($call);
-	if ($dxchan) {
-		if ($user && $user->is_node) {
-			already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
+	my ($dxchan, $user);
+	
+	if (is_webcall($call) && $conn->isa('IntMsg')) {
+		my $newcall = find_next_webcall();
+		unless ($newcall) {
+			already_conn($conn, $call, "Maximum no of web connected connects ($Web::maxssid) exceeded");
 			return;
 		}
-		if ($bumpexisting) {
-			my $ip = $conn->peerhost || 'unknown';
-			$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));
+		$call = $newcall;
+		$user = DXUser::get_current($call);
+		unless ($user) {
+			$user = DXUser->new($call);
+			$user->sort('W');
+			$user->wantbeep(0);
+			$user->name('web');
+			$user->qth('on the web');
+			$user->homenode($main::mycall);
+			$user->lat($main::mylatitude);
+			$user->long($main::mylongitude);
+			$user->qra($main::mylocator);
+		}
+		$user->startt($main::systime);
+		$conn->conns($call);
+		$dxchan = Web->new($call, $conn, $user);
+		$dxchan->enhanced(1);
+		$dxchan->ve7cc(1);
+		$msg =~ s/^A#WEB|/A$call|/;
+		$conn->send_now("C$call");
+	} else {
+		# "Normal" connections
+		unless (is_callsign($call)) {
+			already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
 			return;
 		}
-	}
 
-	# (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) {
-		my @n = $r->parents;
-		my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
-		my $c = $user->maxconnect;
-		my $v;
-		$v = defined $c ? $c : $m;
-		if ($v && @n >= $v) {
-			my $nodes = join ',', @n;
-			LogDbg('DXCommand', "$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+$//;	# remember this for later multiple user processing
+		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;
+			}
 		}
-	}
 
-	# 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 || "unknown";
-			LogDbg('DXCommand', "$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 ($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('DXCommand', "$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/;
 		}
-	}
 
-	if ($user) {
-		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
-	} else {
-		$user = DXUser->new($call);
-	}
 
-	# create the channel
-	if ($user->is_node) {
-		$dxchan = DXProt->new($call, $conn, $user);
-	} elsif ($user->is_user) {
-		$dxchan = DXCommandmode->new($call, $conn, $user);
-#	} elsif ($user->is_bbs) {                                  # there is no support so
-#		$dxchan = BBS->new($call, $conn, $user);               # don't allow it!!!
-	} else {
-		die "Invalid sort of user on $call = $sort";
-	}
+		# (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) {
+			my @n = $r->parents;
+			my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
+			my $c = $user->maxconnect;
+			my $v;
+			$v = defined $c ? $c : $m;
+			if ($v && @n >= $v+$allowmultiple) {
+				my $nodes = join ',', @n;
+				LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
+				already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
+				return;
+			}
+		}
+		
+		if ($user) {
+			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+		} else {
+			$user = DXUser->new($call);
+		}
 
-	# check that the conn has a callsign
-	$conn->conns($call) if $conn->isa('IntMsg');
+		# 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);
+		} elsif ($user->is_user) {
+			$dxchan = DXCommandmode->new($newcall, $conn, $user);
+		} else {
+			die "Invalid sort of user on $call = $sort";
+		}
+	}
+	
 
 	# set callbacks
 	$conn->set_error(sub {my $err = shift; LogDbg('DXCommand', "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') {
+		$dxchan->enhanced(1);
+		$dxchan->sort('W');
+	}
 	$dxchan->rec($msg);
 }
 
@@ -283,6 +381,7 @@ sub cease
 	}
 
 	DXUser::sync;
+	DXUser::writeoutjson;
 
 	if (defined &Local::finish) {
 		eval {
@@ -405,6 +504,9 @@ 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");
+					dbg("Git: V=$v S=$s B=$b g=$g");
 					$version = $v;
 					$build = $b || 0;
 					$gitversion = "$g\[r]";
@@ -435,7 +537,7 @@ sub setup_start
 
 	# initialise User file system
 	dbg("loading user file system ...");
-	DXUser::init(1);
+	DXUser::init(4);			# version 4 == json format
 
 	# look for the sysop and the alias user and complain if they aren't there
 	{
@@ -582,6 +684,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 {
@@ -626,10 +730,10 @@ 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
+	DXCron::process();      # do cron jobs
+	DXXml::process();
 	DXConnect::process();
 	DXMsg::process();
 	DXDb::process();
@@ -637,7 +741,6 @@ sub per_sec
 	DXDupe::process();
 	DXCron::process();			# do cron jobs
 	IsoTime::update($systime);
-	DXProt::process();			# process ongoing ak1a pcxx stuff
 	DXConnect::process();
 	DXUser::process();
 	AGWMsg::process();
@@ -672,6 +775,15 @@ sub per_day
 
 }
 
+sub start_node
+{
+	dbg("Before Web::start_node");
+
+	Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
+
+	dbg("After Web::start_node");
+}
+
 setup_start();
 
 my $main_loop = Mojo::IOLoop->recurring($idle_interval => \&idle_loop);
@@ -684,8 +796,9 @@ my $per10min =  Mojo::IOLoop->recurring(600 => \&per_10_minute);
 my $perhour =  Mojo::IOLoop->recurring(3600 => \&per_hour);
 my $perday =  Mojo::IOLoop->recurring(86400 => \&per_day);
 
-Web::start_node();
+start_node();
 
 cease(0);
+
 exit(0);