use DXVars;
use DXDebug;
use DXLog;
+use DXLogPrint;
use DXUtil;
use DXChannel;
use DXUser;
@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
{
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");
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 $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");
}
}
+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
#
#############################################################
-$systime = time;
+$starttime = $systime = time;
# open the debug file, set various FHs to be unbuffered
foreach (@debug) {