projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed crap handling
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index b1b330b2c983f1377ed82faf0dba5397b38d9886..3014e24fd7cf45bb4e6e3af622de45f4f1b50720 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-107,13
+107,14
@@
sub rec
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
# is there one already connected to me ?
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
# is there one already connected to me ?
- if ($dxchan = DXChannel->get($call)) {
- disconnect($dxchan);
- sleep(1);
+ my $user = DXUser->get($call);
+ if (DXChannel->get($call)) {
+ my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+ 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 (and not a cluster)
- my $user = DXUser->get($call);
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
@@
-220,8
+221,8
@@
sub process_inqueue
# translate any crappy characters into hex characters
if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
# translate any crappy characters into hex characters
if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-
dbg('chan', "<- $sort $call **CRAP**: $line");
-
return;
+
#
dbg('chan', "<- $sort $call **CRAP**: $line");
+
#
return;
}
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
}
# do the really sexy console interface bit! (Who is going to do the TK interface then?)