use AnnTalk;
use WCY;
use Sun;
+use Internet;
use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors);
%Cache = (); # cache of dynamically loaded routine's mod times
%cmd_cache = (); # cache of short names
$errstr = (); # error string from eval
%aliases = (); # aliases for (parts of) commands
$scriptbase = "$main::root/scripts"; # the place where all users start scripts go
+$maxerrors = 20; # the maximum number of concurrent errors allowed before disconnection
#
# obtain a new connection this is derived from dxchannel
$self->send_file($main::motd) if (-e $main::motd);
$self->state('prompt'); # a bit of room for further expansion, passwords etc
$self->{priv} = $user->priv || 0;
- $self->{lang} = $user->lang || 'en';
+ $self->{lang} = $user->lang || $main::lang || 'en';
$self->{pagelth} = $user->pagelth || 20;
$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
$self->{consort} = $line; # save the connection type
$self->{here} = 1;
# get the filters
- $self->{spotfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
+ $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
$self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
$self->send($self->msg('hnodee1')) if !$user->qth;
$self->send($self->msg('m9')) if DXMsg::for_me($call);
- $self->send($self->msg('pr', $call));
+ $self->prompt;
# decide on echo
if (!$user->wantecho) {
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
- $args = "" unless $args;
+ $args = "" unless defined $args;
if ($cmd) {
my $acmd = CmdAlias::get_cmd($cmd);
if ($acmd) {
($cmd, $args) = split /\s+/, "$acmd $args", 2;
- $args = "" unless $args;
+ $args = "" unless defined $args;
dbg('command', "aliased cmd: $cmd $args");
}
}
} else {
dbg('command', "cmd: $cmd not found");
- return ($self->msg('e1'));
+ if (++$self->{errors} > $maxerrors) {
+ $self->send($self->msg('e26'));
+ $self->disconnect;
+ return ();
+ } else {
+ return ($self->msg('e1'));
+ }
}
}
}
- shift @ans;
+ my $ok = shift @ans;
+ if ($ok) {
+ delete $self->{errors};
+ } else {
+ if (++$self->{errors} > $maxerrors) {
+ $self->send($self->msg('e26'));
+ $self->disconnect;
+ return ();
+ }
+ }
return (@ans);
}
#
# finish up a user context
#
-sub finish
+sub disconnect
{
my $self = shift;
- my $conn = shift;
my $call = $self->call;
+ # reset the redirection of messages back to 'normal' if we are the sysop
+ if ($call eq $main::myalias) {
+ my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
+ $node->dxchan($DXProt::me);
+ }
+
# I was the last node visited
$self->user->node($main::mycall);
- # log out text
- if ($conn && -e "$main::data/logout") {
- open(I, "$main::data/logout") or confess;
- my @in = <I>;
- close(I);
- $self->send_now('D', @in);
- sleep(1);
- }
-
-# if ($call eq $main::myalias) { # unset the channel if it is us really
-# my $node = DXNode->get($main::mycall);
-# $node->{dxchan} = 0;
-# }
-
# issue a pc17 to everybody interested
my $nchan = DXChannel->get($main::mycall);
my $pc17 = $nchan->pc17($self);
Log('DXCommand', "$call disconnected");
my $ref = DXCluster->get_exact($call);
$ref->del() if $ref;
+
+ $self->SUPER::disconnect;
}
#
sub prompt
{
my $self = shift;
- $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+ $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
}
# broadcast a message to all users [except those mentioned after buffer]