X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=70c8e6606515015731646ccc4a3e6490cb51c0ef;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=c0565fa1e9e8268b2c3c8aed8719398227f91409;hpb=97315924f561c56cef3b581691409d4217f5c1b5;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index c0565fa1..70c8e660 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXCron;
@@ -13,13 +13,11 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
-use Carp;
 
 use strict;
 
-use vars qw{@crontab $mtime $lasttime $lastmin};
+use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin};
 
-@crontab = ();
 $mtime = 0;
 $lasttime = 0;
 $lastmin = 0;
@@ -34,13 +32,11 @@ sub init
 	if ((-e $localfn && -M $localfn < $mtime) || (-e $fn && -M $fn < $mtime) || $mtime == 0) {
 		my $t;
 		
-		@crontab = ();
-		
 		# first read in the standard one
 		if (-e $fn) {
 			$t = -M $fn;
 			
-			cread($fn);
+			@scrontab = cread($fn);
 			$mtime = $t if  !$mtime || $t <= $mtime;
 		}
 
@@ -48,9 +44,10 @@ sub init
 		if (-e $localfn) {
 			$t = -M $localfn;
 			
-			cread($localfn);
+			@lcrontab = cread($localfn);
 			$mtime = $t if $t <= $mtime;
 		}
+		@crontab = (@scrontab, @lcrontab);
 	}
 }
 
@@ -60,15 +57,16 @@ sub cread
 	my $fn = shift;
 	my $fh = new IO::File;
 	my $line = 0;
+	my @out;
 
-	dbg('cron', "cron: reading $fn\n");
+	dbg("cron: reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
 	while (<$fh>) {
 		$line++;
 		chomp;
 		next if /^\s*#/o or /^\s*$/o;
 		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
-		next if !$min;
+		next unless defined $min;
 		my $ref = bless {};
 		my $err;
 		
@@ -79,13 +77,14 @@ sub cread
 		$err |= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat");
 		if (!$err) {
 			$ref->{cmd} = $cmd;
-			push @crontab, $ref;
-			dbg('cron', "cron: adding $_\n");
+			push @out, $ref;
+			dbg("cron: adding $_\n") if isdbg('cron');
 		} else {
-			dbg('cron', "cron: error on line $line '$_'\n");
+			dbg("cron: error on line $line '$_'\n") if isdbg('cron');
 		}
 	}
 	close($fh);
+	return @out;
 }
 
 sub parse
@@ -148,9 +147,9 @@ sub process
 				(!$cron->{wday} || grep $_ eq $wday, @{$cron->{wday}})	){
 				
 				if ($cron->{cmd}) {
-					dbg('cron', "cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'");
+					dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
 					eval "$cron->{cmd}";
-					dbg('cron', "cron: cmd error $@") if $@;
+					dbg("cron: cmd error $@") if $@ && isdbg('cron');
 				}
 			}
 		}
@@ -169,93 +168,74 @@ sub process
 sub connected
 {
 	my $call = uc shift;
-	return DXChannel->get($call);
+	return DXChannel::get($call);
 }
 
 # is it remotely connected anywhere (with exact callsign)?
 sub present
 {
 	my $call = uc shift;
-	return DXCluster->get_exact($call);
+	return Route::get($call);
 }
 
 # is it remotely connected anywhere (ignoring SSIDS)?
 sub presentish
 {
 	my $call = uc shift;
-	return DXCluster->get($call);
+	my $c = Route::get($call);
+	unless ($c) {
+		for (1..15) {
+			$c = Route::get("$call-$_");
+			last if $c;
+		}
+	}
+	return $c;
 }
 
 # is it remotely connected anywhere (with exact callsign) and on node?
 sub present_on
 {
 	my $call = uc shift;
-	my $node = uc shift;
-	my $ref = DXCluster->get_exact($call);
-	return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+	my $ncall = uc shift;
+	my $node = Route::Node::get($ncall);
+	return ($node) ? grep $call eq $_, $node->users : undef;
 }
 
-# is it remotely connected anywhere (ignoring SSIDS) and on node?
+# is it remotely connected (ignoring SSIDS) and on node?
 sub presentish_on
 {
 	my $call = uc shift;
-	my $node = uc shift;
-	my $ref = DXCluster->get($call);
-	return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+	my $ncall = uc shift;
+	my $node = Route::Node::get($ncall);
+	my $present;
+	if ($node) {
+		$present = grep {/^$call/ } $node->users;
+	}
+	return $present;
 }
 
 # last time this thing was connected
 sub last_connect
 {
 	my $call = uc shift;
-	return $main::systime if DXChannel->get($call);
-	my $user = DXUser->get($call);
+	return $main::systime if DXChannel::get($call);
+	my $user = DXUser::get($call);
 	return $user ? $user->lastin : 0;
 }
 
 # disconnect a locally connected thing
 sub disconnect
 {
-	my $call = uc shift;
-	my $dxchan = DXChannel->get($call);
-	if ($dxchan) {
-		if ($dxchan->is_ak1a) {
-			$dxchan->send_now("D", DXProt::pc39($main::mycall, "$main::mycall DXCron"));
-		} else {
-			$dxchan->send_now('D', "");
-		} 
-		$dxchan->disconnect;
-	}
+	my $call =  shift;
+	run_cmd("disconnect $call");
 }
 
 # start a connect process off
 sub start_connect
 {
-	my $call = uc shift;
-	my $lccall = lc $call;
-
-	my $prog = "$main::root/local/client.pl";
-	$prog = "$main::root/perl/client.pl" if ! -e $prog;
-	
-	my $pid = fork();
-	if (defined $pid) {
-		if (!$pid) {
-			# in child, unset warnings, disable debugging and general clean up from us
-			$^W = 0;
-			eval "{ package DB; sub DB {} }";
-			$SIG{HUP} = 'IGNORE';
-			alarm(0);
-			DXChannel::closeall();
-			$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-			exec $prog, $call, 'connect' or dbg('cron', "exec '$prog' failed $!");
-		}
-		dbg('cron', "connect to $call started");
-	} else {
-		dbg('cron', "can't fork for $prog $!");
-	}
-
-	# coordinate
-	sleep(1);
+	my $call = shift;
+	# connecting is now done in one place - Yeah!
+	run_cmd("connect $call");
 }
 
 # spawn any old job off
@@ -269,15 +249,20 @@ sub spawn
 			# in child, unset warnings, disable debugging and general clean up from us
 			$^W = 0;
 			eval "{ package DB; sub DB {} }";
-			$SIG{HUP} = 'IGNORE';
-			alarm(0);
 			DXChannel::closeall();
-			$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-			exec "$line" or dbg('cron', "exec '$line' failed $!");
+			for (@main::listeners) {
+				$_->close_server;
+			}
+			unless ($main::is_win) {
+				$SIG{HUP} = 'IGNORE';
+				$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
+				alarm(0);
+			}
+			exec "$line" or dbg("exec '$line' failed $!") if isdbg('cron');
 		}
-		dbg('cron', "spawn of $line started");
+		dbg("spawn of $line started") if isdbg('cron');
 	} else {
-		dbg('cron', "can't fork for $line $!");
+		dbg("can't fork for $line $!") if isdbg('cron');
 	}
 
 	# coordinate
@@ -291,11 +276,22 @@ sub rcmd
 	my $line = shift;
 
 	# can we see it? Is it a node?
-	my $noderef = DXCluster->get_exact($call);
-	return  if !$noderef || !$noderef->pcversion;
+	my $noderef = Route::Node::get($call);
+	return  unless $noderef && $noderef->version;
 
 	# send it 
-	DXProt::addrcmd($main::mycall, $call, $line);
+	DXProt::addrcmd($main::me, $call, $line);
+}
+
+sub run_cmd
+{
+	my $line = shift;
+	my @in = DXCommandmode::run_cmd($main::me, $line);
+	dbg("cmd run: $line") if isdbg('cron');
+	for (@in) {
+		s/\s*$//og;
+		dbg("cmd out: $_") if isdbg('cron');
+	}
 }
 1;
 __END__