projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed problems with show/channel
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 435d00873768fce04a968f74434151a40aa09c15..76dea21912b67f81dc8a39d9c1e4da1beef62ac3 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;
@@
-56,8
+60,9
@@
sub rec
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
my $user = DXUser->get($call);
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
my $user = DXUser->get($call);
- $user = DXUser->new($call) if !defined $user;
- $user->sort('U') if (!$user->sort());
+ if (!defined $user) {
+ $user = DXUser->new($call);
+ }
my $sort = $user->sort();
# is there one already connected?
my $sort = $user->sort();
# is there one already connected?
@@
-80,6
+85,13
@@
sub rec
return;
}
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();
+
# 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 ($sort eq 'U');
$dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
@@
-168,13
+180,15
@@
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);
$timenow = time;
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
}
}