projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ping problem
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index c4584ba7014d01a66a362febe1f3c62fde1bd893..e60ce6c6be307e382420bb74a9828d9427780312 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-33,6
+33,8
@@
use DXDebug;
use Filter;
use Prefix;
use Route;
use Filter;
use Prefix;
use Route;
+use DXLog;
+
use strict;
use vars qw(%channels %valid @ISA $count $maxerrors);
use strict;
use vars qw(%channels %valid @ISA $count $maxerrors);
@@
-109,6
+111,7
@@
$count = 0;
priv => '9,Privilege',
prompt => '0,Required Prompt',
rbnfilter => '5,RBN Filt-out',
priv => '9,Privilege',
prompt => '0,Required Prompt',
rbnfilter => '5,RBN Filt-out',
+ rbnseeme => '0,RBN See Me,yesno',
redirect => '0,Redirect messages to',
registered => '9,Registered?,yesno',
remotecmd => '9,doing rcmd,yesno',
redirect => '0,Redirect messages to',
registered => '9,Registered?,yesno',
remotecmd => '9,doing rcmd,yesno',
@@
-123,6
+126,7
@@
$count = 0;
talk => '0,Want Talk,yesno',
talklist => '0,Talk List,parray',
user => '9,DXUser ref',
talk => '0,Want Talk,yesno',
talklist => '0,Talk List,parray',
user => '9,DXUser ref',
+ user_interval => '0,Prompt Idle Time',
ve7cc => '0,VE7CC program special,yesno',
verified => '9,Verified?,yesno',
version => '1,Node Version',
ve7cc => '0,VE7CC program special,yesno',
verified => '9,Verified?,yesno',
version => '1,Node Version',
@@
-134,7
+138,7
@@
$count = 0;
wx => '0,Want WX,yesno',
);
wx => '0,Want WX,yesno',
);
-$maxerrors =
2
0; # the maximum number of concurrent errors allowed before disconnection
+$maxerrors =
1
0; # the maximum number of concurrent errors allowed before disconnection
# object destruction
sub DESTROY
# object destruction
sub DESTROY
@@
-174,6
+178,7
@@
sub alloc
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
$self->{width} ||= 80;
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
$self->{width} ||= 80;
+ $self->{_nospawn} = 0;
# add in all the dxcc, itu, zone info
my @dxcc = Prefix::extract($call);
# add in all the dxcc, itu, zone info
my @dxcc = Prefix::extract($call);
@@
-184,6
+189,11
@@
sub alloc
}
$self->{inqueue} = [];
}
$self->{inqueue} = [];
+ if ($conn) {
+ $self->{hostname} = $self->{conn}->peerhost;
+ $self->{sockhost} = $self->{conn}->sockhost;
+ }
+
$count++;
dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
bless $self, $pkg;
$count++;
dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
bless $self, $pkg;
@@
-197,12
+207,13
@@
sub _error_out
{
my $self = shift;
my $e = shift;
{
my $self = shift;
my $e = shift;
- if (++$self->{errors} > $maxerrors) {
+ if (
$self != $main::me &&
++$self->{errors} > $maxerrors) {
$self->send($self->msg('e26'));
$self->send($self->msg('e26'));
+ LogDbg('err', "DXChannel $self->{call}: too many errors ($self->{errors} > $maxerrors), disconnecting");
$self->disconnect;
return ();
} else {
$self->disconnect;
return ();
} else {
- return ($
self->msg($e)
);
+ return ($
e ? $self->msg($e) : ''
);
}
}
}
}
@@
-714,9
+725,14
@@
sub process_one
while (my $data = shift @{$self->{inqueue}}) {
my ($sort, $call, $line) = $self->decode_input($data);
next unless defined $sort;
while (my $data = shift @{$self->{inqueue}}) {
my ($sort, $call, $line) = $self->decode_input($data);
next unless defined $sort;
-
- # do the really sexy console interface bit! (Who is going to do the TK interface then?)
- dbg("<- $sort $call $line") if $sort ne 'D' && isdbg('chan');
+
+ if ($sort ne 'D') {
+ if (isdbg('chan')) {
+ if (($self->is_rbn && isdbg('rbnchan')) || !$self->is_rbn) {
+ dbg("<- $sort $call $line") if isdbg('chan'); # you may think this is tautology, but it's needed get the correct label on the debug line
+ }
+ }
+ }
# handle A records
my $user = $self->user;
# handle A records
my $user = $self->user;
@@
-771,6
+787,15
@@
sub error_handler
$self->disconnect(1);
}
$self->disconnect(1);
}
+sub refresh_user
+{
+ my $call = shift;
+ my $user = shift;
+ return unless $call && $user && ref $user;
+ my $self = DXChannel::get($call);
+ $self->{user} = $user;
+ return $user;
+}
sub isregistered
{
sub isregistered
{