X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=a46e3b2d58f692e9905666b4618484a47c8be18a;hb=7de34899527cbc4dfacdcc6452926b3d2d73792c;hp=1af0388a3449ed82a9bfdeb7a370f4579505e3a8;hpb=f0ac8322367c66080b6dbb74da4de72dae126dc3;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1af0388a..a46e3b2d 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -59,6 +59,9 @@ use Geomag;
 use CmdAlias;
 use Filter;
 use Local;
+use DXDb;
+use Data::Dumper;
+
 use Fcntl ':flock'; 
 
 use Carp qw(cluck);
@@ -67,9 +70,10 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.30";				# the version no of the software
+$version = "1.36";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
+@outstanding_connects = ();     # list of outstanding connects
       
 # handle disconnections
 sub disconnect
@@ -89,6 +93,8 @@ sub already_conn
 	sleep(1);
 	dbg('chan', "-> Z $call bye\n");
 	$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+	sleep(1);
+	$conn->disconnect();
 }
 
 # handle incoming messages
@@ -98,28 +104,40 @@ sub rec
 	my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
 	
 	if (defined $err && $err) {
-		disconnect($dxchan) if defined $dxchan;
+		if ($dxchan) {
+			$dxchan->disconnect;
+		}
 		return;
 	}
 	
 	# set up the basic channel info - this needs a bit more thought - there is duplication here
 	if (!defined $dxchan) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
-
-                # is there one already connected to me ? 
+		my ($scall, $ssid) = split /-/, $call;
+		
+		# adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections
+        if ($ssid) {
+			$ssid = 15 if $ssid > 15;
+			if ($ssid > 8) {
+				$ssid = 15 - $ssid;
+				$call = "$scall-$ssid";
+			}
+		}
+ 
+		# is there one already connected to me - locally? 
 		my $user = DXUser->get($call);
 		if (DXChannel->get($call)) {
-		        my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+			my $mess = DXM::msg($lang, ($user && $user->sort eq 'A') ? 'concluster' : 'conother', $call);
 			already_conn($conn, $call, $mess);
 			return;
 		}
 		
-		# is there one already connected elsewhere in the cluster (and not a cluster)
+		# is there one already connected elsewhere in the cluster?
 		if ($user) {
 			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXCluster->get($call) || DXChannel->get($call)) {
+				if (DXCluster->get_exact($call)) {
 					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
 					already_conn($conn, $call, $mess);
 					return;
@@ -127,7 +145,7 @@ sub rec
 			}
 			$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 		} else {
-			if (DXCluster->get($call)) {
+			if (DXCluster->get_exact($call)) {
 				my $mess = DXM::msg($lang, 'conother', $call);
 				already_conn($conn, $call, $mess);
 				return;
@@ -145,6 +163,7 @@ sub rec
 		# create the channel
 		$dxchan = DXCommandmode->new($call, $conn, $user) if ($user->sort eq 'U');
 		$dxchan = DXProt->new($call, $conn, $user) if ($user->sort eq 'A');
+		$dxchan = BBS->new($call, $conn, $user) if ($user->sort eq 'B');
 		die "Invalid sort of user on $call = $sort" if !$dxchan;
 	}
 	
@@ -175,9 +194,9 @@ sub cease
 	};
 	dbg('local', "Local::finish error $@") if $@;
 
-	# disconnect users
+	# disconnect nodes
 	foreach $dxchan (DXChannel->get_all()) {
-		next if $dxchan->is_ak1a;
+		next unless $dxchan->is_ak1a;
 		disconnect($dxchan) unless $dxchan == $DXProt::me;
 	}
 	Msg->event_loop(1, 0.05);
@@ -187,9 +206,9 @@ sub cease
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
 
-	# disconnect nodes
+	# disconnect users
 	foreach $dxchan (DXChannel->get_all()) {
-		next unless $dxchan->is_ak1a;
+		next if $dxchan->is_ak1a;
 		disconnect($dxchan) unless $dxchan == $DXProt::me;
 	}
 	Msg->event_loop(1, 0.05);
@@ -198,13 +217,11 @@ sub cease
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
 	DXUser::finish();
+
+	# close all databases
+	DXDb::closeall;
+	
 	dbg('chan', "DXSpider version $version ended");
 	Log('cluster', "DXSpider V$version stopped");
 	dbgclose();
@@ -219,6 +236,7 @@ sub reap
 {
 	$SIG{'CHLD'} = \&reap;
 	my $cpid = wait;
+	@outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -231,15 +249,14 @@ sub process_inqueue
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
 	my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
-
+	my $error;
+	
 	# the above regexp must work
 	return unless ($sort && $call && $line);
 	
 	# translate any crappy characters into hex characters 
 	if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
 		$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-#		dbg('chan', "<- $sort $call **CRAP**: $line");
-#		return;
 	}
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
@@ -251,12 +268,11 @@ sub process_inqueue
 		$dxchan->start($line, $sort);  
 	} elsif ($sort eq 'I') {
 		die "\$user not defined for $call" if !defined $user;
-		
 		# normal input
 		$dxchan->normal($line);
-		
 		disconnect($dxchan) if ($dxchan->{state} eq 'bye');
 	} elsif ($sort eq 'Z') {
+		$dxchan->conn(undef);
 		disconnect($dxchan);
 	} elsif ($sort eq 'D') {
 		;                       # ignored (an echo)
@@ -293,7 +309,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
 
 # load Prefixes
 print "loading prefixes ...\n";
@@ -346,6 +362,10 @@ DXMsg::clean_old();
 print "reading cron jobs ...\n";
 DXCron->init();
 
+# read in database descriptors
+print "reading database descriptors ...\n";
+DXDb::load();
+
 # starting local stuff
 print "doing local initialisation ...\n";
 eval {
@@ -361,7 +381,7 @@ print "orft we jolly well go ...\n";
 dbg('chan', "DXSpider version $version started...");
 for (;;) {
 	my $timenow;
-	Msg->event_loop(1, 0.001);
+	Msg->event_loop(1, 0.1);
 	$timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
 	
@@ -375,6 +395,7 @@ for (;;) {
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
 		DXMsg::process();
+		DXDb::process();
 		eval { 
 			Local::process();       # do any localised processing
 		};