}
use Msg;
+use IntMsg;
+use ExtMsg;
use DXVars;
use DXDebug;
use DXLog;
package main;
-#use strict;
-#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
-# $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+use strict;
+use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
+ @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
$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
-
-# handle disconnections
-sub disconnect
-{
- my $dxchan = shift;
- return if !defined $dxchan;
- $dxchan->disconnect();
-}
+#@outstanding_connects = (); # list of outstanding connects
+@listeners = (); # list of listeners
+
# send a message to call on conn and disconnect
sub already_conn
{
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);
- $conn->disconnect();
+ sleep(2);
+ $conn->disconnect;
+}
+
+sub error_handler
+{
+ my $dxchan = shift;
+ $dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
+ $dxchan->disconnect;
}
# handle incoming messages
-sub rec
+sub new_channel
{
- my ($conn, $msg, $err) = @_;
- my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
+ my ($conn, $msg) = @_;
+ 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;
- }
+ # set up the basic channel info
+ # is there one already connected to me - locally?
+ my $user = DXUser->get($call);
+ my $dxchan = DXChannel->get($call);
+ if ($dxchan) {
+ my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
+ already_conn($conn, $call, $mess);
return;
}
- # set up the basic channel info - this needs a bit more thought - there is duplication here
- 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);
- already_conn($conn, $call, $mess);
- 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 (DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, $user->is_node ? 'concluster' : 'conother', $call);
- already_conn($conn, $call, $mess);
- return;
- }
- }
- $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
+ # is there one already connected elsewhere in the cluster?
+ if ($user) {
+ if (($user->is_node || $call eq $myalias) && !DXCluster->get_exact($call)) {
+ ;
} 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;
}
- $user = DXUser->new($call);
}
-
- # 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
+ $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->call);
+ already_conn($conn, $call, $mess);
return;
}
-
- # create the channel
- $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
- $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
- $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
- die "Invalid sort of user on $call = $sort" if !$dxchan;
+ $user = DXUser->new($call);
}
+ # is he locked out ?
+ if ($user->lockout) {
+ Log('DXCommand', "$call is locked out, disconnected");
+ $conn->disconnect;
+ return;
+ }
+
+ # create the channel
+ $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
+ $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
+ $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
+ die "Invalid sort of user on $call = $sort" if !$dxchan;
+
+ # check that the conn has a callsign
+ $conn->conns($call) if $conn->isa('IntMsg');
+
+ # set callbacks
+ $conn->set_error(sub {error_handler($dxchan)});
+ $conn->set_rproc(sub {my ($conn,$msg) = @_; rec($dxchan, $conn, $msg);});
+ rec($dxchan, $conn, $msg);
+}
+
+sub rec
+{
+ my ($dxchan, $conn, $msg) = @_;
+
# queue the message and the channel object for later processing
if (defined $msg) {
my $self = bless {}, "inqueue";
sub login
{
- return \&rec;
+ return \&new_channel;
}
# cease running this program, close down all the connections nicely
# disconnect nodes
foreach $dxchan (DXChannel->get_all()) {
next unless $dxchan->is_node;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ $dxchan->disconnect unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
# disconnect users
foreach $dxchan (DXChannel->get_all()) {
next if $dxchan->is_node;
- disconnect($dxchan) unless $dxchan == $DXProt::me;
+ $dxchan->disconnect unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
# close all databases
DXDb::closeall;
-
+
+ # close all listeners
+ for (@listeners) {
+ $_->close_server;
+ }
+
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
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");
die "\$user not defined for $call" if !defined $user;
# normal input
$dxchan->normal($line);
- disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+ $dxchan->disconnect if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
- $dxchan->conn(undef);
- disconnect($dxchan);
+ $dxchan->disconnect;
} elsif ($sort eq 'D') {
; # ignored (an echo)
} else {
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-dbg('err', "starting listener ...");
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+use Listeners;
+
+dbg('err', "starting listeners ...");
+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) {
+ $conn = ExtMsg->new_server($_->[0], $_->[1], \&login);
+ $conn->conns("Server $_->[0]/$_->[1]");
+ push @listeners, $conn;
+ dbg('err', "External Port: $_->[0] $_->[1]");
+}
# load bad words
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
unless ($^O =~ /^MS/) {
- $SIG{INT} = \&cease;
- $SIG{TERM} = \&cease;
+ unless ($DB::VERSION) {
+ $SIG{INT} = \&cease;
+ $SIG{TERM} = \&cease;
+ }
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
for (;;) {
# $DB::trace = 1;
- Msg->event_loop(1, 0.1);
+ Msg->event_loop(10, 0.010);
my $timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
# $DB::trace = 0;
projects / spider.git / blobdiff