projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh/dx and sh/dxcc now fully implemented
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 79c5b5c86300b7622d7bad57288e08c6f5f6d383..e98dd156996eaafc1a175e26236c3b1e9501be3c 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-1,17
+1,21
@@
#!/usr/bin/perl
#
#!/usr/bin/perl
#
-# A thing that implements dxcluster 'protocol'
+# This is the DX cluster 'daemon'. It sits in the middle of its little
+# web of client routines sucking and blowing data where it may.
#
#
-# This is a perl module/program that sits on the end of a dxcluster
-# 'protocol' connection and deals with anything that might come along.
-#
-# this program is called by ax25d and gets raw ax25 text on its input
+# Hence the name of 'spider' (although it may become 'dxspider')
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
# $Id$
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
# $Id$
#
+# make sure that modules are searched in the order local then perl
+BEGIN {
+ unshift @INC, '/spider/perl'; # this IS the right way round!
+ unshift @INC, '/spider/local';
+}
+
use Msg;
use DXVars;
use DXUtil;
use Msg;
use DXVars;
use DXUtil;
@@
-22,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;
@@
-55,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;
@@
-76,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;
}
@@
-160,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
@@
-171,18
+182,24
@@
$SIG{'INT'} = \&cease;
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
+# initialise the protocol engine
+DXProt->init();
+
# 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);
$timenow = time;
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);
$timenow = time;
+ process_inqueue(); # read in lines from the input queue and despatch them
+
+ # do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
$systime = $timenow;
$cldate = &cldate();
$ztime = &ztime();
if ($timenow != $systime) {
$systime = $timenow;
$cldate = &cldate();
$ztime = &ztime();
+ DXCommandmode::process(); # process ongoing command mode stuff
+ DXProt::process(); # process ongoing ak1a pcxx stuff
}
}
- process_inqueue(); # read in lines from the input queue and despatch them
- DXCommandmode::process(); # process ongoing command mode stuff
- DXProt::process(); # process ongoing ak1a pcxx stuff
}
}