$version = "1.47"; # 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
+#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
- sleep(1);
- dbg('chan', "-> Z $call bye\n");
- $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
- sleep(1);
+ sleep(2);
$conn->disconnect;
}
+sub error_handler
+{
+ my $dxchan = shift;
+ $dxchan->disconnect;
+}
+
# handle incoming messages
sub rec
{
- my ($conn, $msg, $err) = @_;
+ my ($conn, $msg) = @_;
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
+ my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
+ return unless defined $sort;
- if (!defined $msg || (defined $err && $err)) {
- if ($dxchan) {
- if (defined $err) {
- $conn->disconnect;
- undef $conn;
- $dxchan->conn(undef);
- }
- $dxchan->disconnect;
- } elsif ($conn) {
- $conn->disconnect;
- }
- return;
- }
-
- # set up the basic channel info - this needs a bit more thought - there is duplication here
+ # set up the basic channel info
if (!defined $dxchan) {
- my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
- return unless defined $sort;
-
+
# is there one already connected to me - locally?
my $user = DXUser->get($call);
- if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call);
+ if ($sort ne 'O' && Msg->conns($call)) {
+ my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
already_conn($conn, $call, $mess);
return;
}
if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
- if (DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, $user->is_node ? 'concluster' : 'conother', $call);
+ if (my $ref = DXCluster->get_exact($call)) {
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
already_conn($conn, $call, $mess);
return;
}
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
- if (DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'conother', $call);
+ if (my $ref = DXCluster->get_exact($call)) {
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
already_conn($conn, $call, $mess);
return;
}
# is he locked out ?
if ($user->lockout) {
Log('DXCommand', "$call is locked out, disconnected");
- $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+ $conn->disconnect;
return;
}
+ # mark him up
+ $conn->conns($call) unless $sort eq 'O';
+ $conn->set_error(sub {error_handler($dxchan)});
+
# create the channel
$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
my $cpid;
while (($cpid = waitpid(-1, WNOHANG)) > 0) {
dbg('reap', "cpid: $cpid");
- @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+# Msg->pid_gone($cpid);
$zombies-- if $zombies > 0;
}
dbg('reap', "cpid: $cpid");
use Listeners;
dbg('err', "starting listeners ...");
-push @listeners, IntMsg->new_server("$clusteraddr", $clusterport, \&login);
+my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
+$conn->conns("Server $clusteraddr/$clusterport");
+push @listeners, $conn;
dbg('err', "Internal port: $clusteraddr $clusterport");
for (@main::listen) {
- push @listeners, ExtMsg->new_server($_->[0], $_->[1], \&login);
+ $conn = ExtMsg->new_server($_->[0], $_->[1], \&login);
+ $conn->conns("Server $_->[0]/$_->[1]");
+ push @listeners, $conn;
dbg('err', "External Port: $_->[0] $_->[1]");
}
for (;;) {
# $DB::trace = 1;
- Msg->event_loop(1, 0.1);
+ Msg->event_loop(10, 0.001);
my $timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
# $DB::trace = 0;