projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
did some work on the cluster database related things
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 76dea21912b67f81dc8a39d9c1e4da1beef62ac3..e3309a159e2424749ee15638c4c085eaeb2fdf48 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-26,6
+26,8
@@
use DXCommandmode;
use DXProt;
use DXCluster;
use DXDebug;
use DXProt;
use DXCluster;
use DXDebug;
+use Prefix;
+use Bands;
package main;
package main;
@@
-59,17
+61,13
@@
sub rec
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
- my $user = DXUser->get($call);
- if (!defined $user) {
- $user = DXUser->new($call);
- }
- my $sort = $user->sort();
-
- # is there one already connected?
+
+ # is there one already connected?
if (DXChannel->get($call)) {
my $mess = DXM::msg('conother', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
if (DXChannel->get($call)) {
my $mess = DXM::msg('conother', $call);
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
return;
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
return;
@@
-80,21
+78,20
@@
sub rec
my $mess = DXM::msg('concluster', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
my $mess = DXM::msg('concluster', $call);
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
return;
}
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
return;
}
- # set some necessary flags on the user if they are connecting
- $user->wwv(1) if !$user->wwv();
- $user->talk(1) if !$user->talk();
- $user->ann(1) if !$user->ann();
- $user->here(1) if !$user->here();
- $user->sort('U') if !$user->sort();
+ my $user = DXUser->get($call);
+ if (!defined $user) {
+ $user = DXUser->new($call);
+ }
-
# create the channel
- $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
- $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+ # create the channel
+ $dxchan = DXCommandmode->new($call, $conn, $user) if ($
user->
sort eq 'U');
+ $dxchan = DXProt->new($call, $conn, $user) if ($
user->
sort eq 'A');
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
@@
-164,10
+161,20
@@
foreach(@debug) {
}
STDOUT->autoflush(1);
}
STDOUT->autoflush(1);
+# load Prefixes
+print "loading prefixes ...\n";
+Prefix::load();
+
+# load band data
+print "loading band data ...\n";
+Bands::load();
+
# initialise User file system
# initialise User file system
+print "loading user file system ...\n";
DXUser->init($userfn);
# start listening for incoming messages/connects
DXUser->init($userfn);
# start listening for incoming messages/connects
+print "starting listener ...\n";
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
@@
-175,7
+182,14
@@
$SIG{'INT'} = \&cease;
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
+# initialise the protocol engine
+DXProt->init();
+
+# put in a DXCluster node for us here so we can add users and take them away
+DXNode->new(0, $mycall, 0, 1, $DXProtvars::myprot_version);
+
# this, such as it is, is the main loop!
# this, such as it is, is the main loop!
+print "orft we jolly well go ...\n";
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);