X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=572be7a9d6cdae83abe7a0ced707773ff692096d;hb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;hp=35881d452d88f96ee82f6516e0b59e23bdb4622e;hpb=ca8e84c32e70ea8eb1f30e716b7dbdc92f7e5083;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 35881d45..572be7a9 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -61,7 +61,6 @@ use DXProtVars;
 use DXProtout;
 use DXProt;
 use DXMsg;
-use DXCluster;
 use DXCron;
 use DXConnect;
 use DXBearing;
@@ -115,7 +114,7 @@ sub already_conn
 	my ($conn, $call, $mess) = @_;
 
 	$conn->disable_read(1);
-	dbg('chan', "-> D $call $mess\n"); 
+	dbg("-> D $call $mess\n") if isdbg('chan'); 
 	$conn->send_now("D$call|$mess");
 	sleep(2);
 	$conn->disconnect;
@@ -145,24 +144,9 @@ sub new_channel
 		return;
 	}
 	
-	# is there one already connected elsewhere in the cluster?
 	if ($user) {
-		if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
-			;
-		} else {
-			if (my $ref = DXCluster->get_exact($call)) {
-				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
-				already_conn($conn, $call, $mess);
-				return;
-			}
-		}
 		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 	} else {
-		if (my $ref = DXCluster->get_exact($call)) {
-			my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
-			already_conn($conn, $call, $mess);
-			return;
-		}
 		$user = DXUser->new($call);
 	}
 	
@@ -221,7 +205,7 @@ sub cease
 	eval {
 		Local::finish();   # end local processing
 	};
-	dbg('local', "Local::finish error $@") if $@;
+	dbg("Local::finish error $@") if $@;
 
 	# disconnect nodes
 	foreach $dxchan (DXChannel->get_all_nodes) {
@@ -250,7 +234,7 @@ sub cease
 		$l->close_server;
 	}
 
-	dbg('chan', "DXSpider version $version, build $build ended");
+	dbg("DXSpider version $version, build $build ended") if isdbg('chan');
 	Log('cluster', "DXSpider V$version, build $build ended");
 	dbgclose();
 	Logclose();
@@ -264,11 +248,11 @@ sub reap
 {
 	my $cpid;
 	while (($cpid = waitpid(-1, WNOHANG)) > 0) {
-		dbg('reap', "cpid: $cpid");
+		dbg("cpid: $cpid") if isdbg('reap');
 #		Msg->pid_gone($cpid);
 		$zombies-- if $zombies > 0;
 	}
-	dbg('reap', "cpid: $cpid");
+	dbg("cpid: $cpid") if isdbg('reap');
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -285,7 +269,7 @@ sub process_inqueue
 	return unless defined $sort;
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
-	dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
+	dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
 
 	# handle A records
 	my $user = $dxchan->user;
@@ -300,6 +284,8 @@ sub process_inqueue
 		$dxchan->disconnect;
 	} elsif ($sort eq 'D') {
 		;                       # ignored (an echo)
+	} elsif ($sort eq 'G') {
+		$dxchan->enhanced($line);
 	} else {
 		print STDERR atime, " Unknown command letter ($sort) received from $call\n";
 	}
@@ -331,7 +317,7 @@ $starttime = $systime = time;
 $lang = 'en' unless $lang;
 
 # open the debug file, set various FHs to be unbuffered
-dbginit();
+dbginit(\&DXCommandmode::broadcast_debug);
 foreach (@debug) {
 	dbgadd($_);
 }
@@ -347,51 +333,55 @@ while (<CL>) {
 	push @fn, $1;
 }
 close CL;
+my $subbuild;
 foreach my $fn (@fn) {
 	$fn =~ s|::|/|g;
 	open(CL, "$main::root/perl/${fn}.pm") or next;
 	while (<CL>) {
-		if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+		if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)\.?(\d+.\d+)?/ ) {
 			$build += $1;
+			$subbuild += $2 if $2;
 			last;
 		}
 	}
 	close CL;
 }
+$build = "$build.$subbuild" if $subbuild;
 
 Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg("Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
-dbg('err', "loading prefixes ...");
+dbg("loading prefixes ...");
 Prefix::load();
 
 # load band data
-dbg('err', "loading band data ...");
+dbg("loading band data ...");
 Bands::load();
 
 # initialise User file system
-dbg('err', "loading user file system ..."); 
+dbg("loading user file system ..."); 
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-dbg('err', "starting listeners ...");
+dbg("starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
 $conn->conns("Server $clusteraddr/$clusterport");
 push @listeners, $conn;
-dbg('err', "Internal port: $clusteraddr $clusterport");
+dbg("Internal port: $clusteraddr $clusterport");
 foreach my $l (@main::listen) {
 	$conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
 	$conn->conns("Server $l->[0]/$l->[1]");
 	push @listeners, $conn;
-	dbg('err', "External Port: $l->[0] $l->[1]");
+	dbg("External Port: $l->[0] $l->[1]");
 }
 AGWrestart();
 
 # load bad words
-dbg('err', "load badwords: " . (BadWords::load or "Ok"));
+dbg("load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
 unless ($DB::VERSION) {
@@ -402,15 +392,15 @@ unless ($is_win) {
 	$SIG{HUP} = 'IGNORE';
 	$SIG{CHLD} = sub { $zombies++ };
 	
-	$SIG{PIPE} = sub { 	dbg('err', "Broken PIPE signal received"); };
-	$SIG{IO} = sub { 	dbg('err', "SIGIO received"); };
+	$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
+	$SIG{IO} = sub { 	dbg("SIGIO received"); };
 	$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
 	$SIG{KILL} = 'DEFAULT';     # as if it matters....
 
 	# catch the rest with a hopeful message
 	for (keys %SIG) {
 		if (!$SIG{$_}) {
-			#		dbg('chan', "Catching SIG $_");
+			#		dbg("Catching SIG $_") if isdbg('chan');
 			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  }; 
 		}
 	}
@@ -433,38 +423,43 @@ WCY->init();
 Spot->init();
 
 # initialise the protocol engine
-dbg('err', "reading in duplicate spot and WWV info ...");
+dbg("reading in duplicate spot and WWV info ...");
 DXProt->init();
 
 # put in a DXCluster node for us here so we can add users and take them away
-DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version); 
-$routeroot = Route::Node->new($mycall, $version, Route::here($DXProt::me->here)|Route::conf($DXProt::me->confmode));
+$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($DXProt::me->here)|Route::conf($DXProt::me->conf));
+
+# make sure that there is a routing OUTPUT node default file
+#unless (Filter::read_in('route', 'node_default', 0)) {
+#	my $dxcc = $DXProt::me->dxcc;
+#	$Route::filterdef->cmd($DXProt::me, 'route', 'accept', "node_default call $mycall" );
+#}
 
 # read in any existing message headers and clean out old crap
-dbg('err', "reading existing message headers ...");
+dbg("reading existing message headers ...");
 DXMsg->init();
 DXMsg::clean_old();
 
 # read in any cron jobs
-dbg('err', "reading cron jobs ...");
+dbg("reading cron jobs ...");
 DXCron->init();
 
 # read in database descriptors
-dbg('err', "reading database descriptors ...");
+dbg("reading database descriptors ...");
 DXDb::load();
 
 # starting local stuff
-dbg('err', "doing local initialisation ...");
+dbg("doing local initialisation ...");
 eval {
 	Local::init();
 };
-dbg('local', "Local::init error $@") if $@;
+dbg("Local::init error $@") if $@;
 
 # print various flags
-#dbg('err', "seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
+#dbg("seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
 
 # this, such as it is, is the main loop!
-dbg('err', "orft we jolly well go ...");
+dbg("orft we jolly well go ...");
 
 #open(DB::OUT, "|tee /tmp/aa");
 
@@ -493,7 +488,7 @@ for (;;) {
 		eval { 
 			Local::process();       # do any localised processing
 		};
-		dbg('local', "Local::process error $@") if $@;
+		dbg("Local::process error $@") if $@;
 	}
 	if ($decease) {
 		last if --$decease <= 0;