projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5. Added auto prompting for name, qth, location and homenode if any of these
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 8e88884214b0b3b239d003d31f2982cbb7b14265..0caade5c98da91c243181658bc17ce1b58e5c233 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-27,6
+27,7
@@
use Msg;
use DXVars;
use DXDebug;
use DXLog;
use DXVars;
use DXDebug;
use DXLog;
+use DXLogPrint;
use DXUtil;
use DXChannel;
use DXUser;
use DXUtil;
use DXChannel;
use DXUser;
@@
-47,8
+48,9
@@
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = 1.5; # the version no of the software
-
+$version = 1.8; # the version no of the software
+$starttime = 0; # the starting time of the cluster
+
# handle disconnections
sub disconnect
{
# handle disconnections
sub disconnect
{
@@
-83,8
+85,12
@@
sub rec
return;
}
return;
}
- # is there one already connected elsewhere in the cluster?
- if (DXCluster->get($call)) {
+ # is there one already connected elsewhere in the cluster (and not a cluster)
+ my $user = DXUser->get($call);
+ if ($user && $user->sort eq 'A' && !DXCluster->get_exact($call)) {
+ ;
+ } elsif (($call eq $main::myalias && DXCluster->get_exact($call)) ||
+ DXCluster->get($call)) {
my $mess = DXM::msg($lang, 'concluster', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
my $mess = DXM::msg($lang, 'concluster', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
@@
-94,6
+100,7
@@
sub rec
return;
}
return;
}
+ # the user MAY have an SSID if local, but otherwise doesn't
my $user = DXUser->get($call);
if (!defined $user) {
$user = DXUser->new($call);
my $user = DXUser->get($call);
if (!defined $user) {
$user = DXUser->new($call);
@@
-148,7
+155,7
@@
sub process_inqueue
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my $data = $self->{data};
my $dxchan = $self->{dxchan};
- my ($sort, $call, $line) = $data =~ /^(\w)(\
w
+)\|(.*)$/;
+ my ($sort, $call, $line) = $data =~ /^(\w)(\
S
+)\|(.*)$/;
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n");
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n");
@@
-171,13
+178,23
@@
sub process_inqueue
}
}
}
}
+sub uptime
+{
+ my $t = $systime - $starttime;
+ my $days = int $t / 86400;
+ $t -= $days * 86400;
+ my $hours = int $t / 3600;
+ $t -= $hours * 3600;
+ my $mins = int $t / 60;
+ return sprintf "%d %02d:%02d", $days, $hours, $mins;
+}
#############################################################
#
# The start of the main line of code
#
#############################################################
#############################################################
#
# The start of the main line of code
#
#############################################################
-$systime = time;
+$s
tarttime = $s
ystime = time;
# open the debug file, set various FHs to be unbuffered
foreach (@debug) {
# open the debug file, set various FHs to be unbuffered
foreach (@debug) {