projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made ssids unique everywhere
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index dd12a9dfe22dc564058cadadb463bde7994f281a..a46e3b2d58f692e9905666b4618484a47c8be18a 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-70,7
+70,7
@@
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.3
5
"; # the version no of the software
+$version = "1.3
6
"; # 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
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
@outstanding_connects = (); # list of outstanding connects
@@
-94,7
+94,7
@@
sub already_conn
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
sleep(1);
- $conn->disconnect;
+ $conn->disconnect
()
;
}
# handle incoming messages
}
# handle incoming messages
@@
-105,7
+105,7
@@
sub rec
if (defined $err && $err) {
if ($dxchan) {
if (defined $err && $err) {
if ($dxchan) {
-
disconnect($dxchan)
;
+
$dxchan->disconnect
;
}
return;
}
}
return;
}
@@
-113,21
+113,31
@@
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+)\|(.*)$/;
-
- # is there one already connected to me ?
+ my ($scall, $ssid) = split /-/, $call;
+
+ # adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections
+ if ($ssid) {
+ $ssid = 15 if $ssid > 15;
+ if ($ssid > 8) {
+ $ssid = 15 - $ssid;
+ $call = "$scall-$ssid";
+ }
+ }
+
+ # is there one already connected to me - locally?
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang,
$user->sort eq 'A'
? 'concluster' : 'conother', $call);
+ my $mess = DXM::msg($lang,
($user && $user->sort eq 'A')
? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
- # is there one already connected elsewhere in the cluster
(and not a cluster)
+ # is there one already connected elsewhere in the cluster
?
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
- if (DXCluster->get
($call) || DXChannel->ge
t($call)) {
+ if (DXCluster->get
_exac
t($call)) {
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
@@
-135,7
+145,7
@@
sub rec
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
- if (DXCluster->get($call)) {
+ if (DXCluster->get
_exact
($call)) {
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
@@
-184,9
+194,9
@@
sub cease
};
dbg('local', "Local::finish error $@") if $@;
};
dbg('local', "Local::finish error $@") if $@;
- # disconnect
user
s
+ # disconnect
node
s
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
if
$dxchan->is_ak1a;
+ next
unless
$dxchan->is_ak1a;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-196,9
+206,9
@@
sub cease
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
node
s
+ # disconnect
user
s
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
unless
$dxchan->is_ak1a;
+ next
if
$dxchan->is_ak1a;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-207,12
+217,6
@@
sub cease
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);
- 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);
DXUser::finish();
# close all databases
DXUser::finish();
# close all databases
@@
-305,7
+309,7
@@
STDOUT->autoflush(1);
Log('cluster', "DXSpider V$version started");
# banner
Log('cluster', "DXSpider V$version started");
# banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998
-1999
Dirk Koopman G1TLH\n";
# load Prefixes
print "loading prefixes ...\n";
# load Prefixes
print "loading prefixes ...\n";