use QSL;
use DB_File;
use VE7CC;
-use Thingy;
-use Thingy::Dx;
-use Thingy::Hello;
-use Thingy::Bye;
+use DXXml;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
- $maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
+ $maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
%Cache = (); # cache of dynamically loaded routine's mod times
%cmd_cache = (); # cache of short names
$maxerrors = 20; # the maximum number of concurrent errors allowed before disconnection
$maxbadcount = 3; # no of bad words allowed before disconnection
$msgpolltime = 3600; # the time between polls for new messages
-$default_pagelth = 20; # the default page length 0 = unlimited
$cmdimportdir = "$main::root/cmd_import"; # the base directory for importing command scripts
# this does not exist as default, you need to create it manually
-
-
+ #
use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
#
# obtain a new connection this is derived from dxchannel
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
- my @rout = $main::routeroot->add_user($call, 1);
+ my @rout = $main::routeroot->add_user($call, Route::here(1));
-
+ # ALWAYS output the user
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
+
return $self;
}
my $name = $user->{name};
# log it
- my $host = $self->{conn}->{peerhost} || "unknown";
- Log('DXCommand', "$call connected from $host");
+ my $host = $self->{conn}->{peerhost};
+ $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+ $host ||= "unknown";
+ LogDbg('DXCommand', "$call connected from $host");
$self->{name} = $name ? $name : $call;
$self->send($self->msg('l2',$self->{name}));
$user->lastoper($main::systime + ((int rand(10)) * 86400));
}
- # ALWAYS output the user
- my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
- $thing->broadcast($self);
- $self->lasthello($main::systime);
-
# run a script send the output to the punter
my $script = new Script(lc $call) || new Script('user_default');
$script->run($self) if $script;
my @bad;
if (@bad = BadWords::check($l)) {
$self->badcount(($self->badcount||0) + @bad);
- Log('DXCommand', "$self->{call} swore: $l");
+ LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
$self->send_talks($_, $l);
my @bad;
if (@bad = BadWords::check($cmdline)) {
$self->badcount(($self->badcount||0) + @bad);
- Log('DXCommand', "$self->{call} swore: $cmdline");
+ LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
} else {
for (@{$self->{talklist}}) {
$self->send_talks($_, $rawline);
# check for excessive swearing
if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
- Log('DXCommand', "$self->{call} logged out for excessive swearing");
+ LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
$self->disconnect;
return;
}
return () if length $cmdline == 0;
-
+
+
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
$args = "" unless defined $args;
if ($cmd) {
- # strip out // and .. on command only
+ # strip out // on command only
$cmd =~ s|//|/|g;
$cmd =~ s|^/||g; # no leading / either
- $cmd =~ s|[^-?\w/]||g; # and no funny characters
+ $cmd =~ s|[^-?\w/]||g; # and no funny characters either
my ($path, $fcmd);
# issue a pc17 to everybody interested
$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
-
- my $thing = Thingy::Bye->new(user=>$call);
- $thing->broadcast($self);
} else {
confess "trying to disconnect a non existant user $call";
}
# send info to all logged in thingies
$self->tell_login('logoutu');
- # remove any outstanding pings I have sent
- Thingy::Ping::forget($call);
-
- Log('DXCommand', "$call disconnected");
+ LogDbg('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
}
return grep {$_->{sort} eq 'U'} DXChannel::get_all();
}
+# run a script for this user
+sub run_script
+{
+ my $self = shift;
+ my $silent = shift || 0;
+
+}
+
#
# search for the command in the cache of short->long form commands
#
my $dirfn;
my $curdir = $path;
- while (my $p = shift @parts) {
- opendir(D, $curdir) or confess "can't open $curdir $!";
- my @ls = readdir D;
- closedir D;
-
- # if this isn't the last part
- if (@parts) {
- my $found;
- foreach my $l (sort @ls) {
- next if $l =~ /^\./;
- if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
- dbg("got dir: $curdir/$l\n") if isdbg('command');
- $dirfn .= "$l/";
- $curdir .= "/$l";
- $found++;
- last;
- }
- }
- # only proceed if we find the directory asked for
- return () unless $found;
- } else {
- foreach my $l (sort @ls) {
- next if $l =~ /^\./;
- next unless $l =~ /\.$suffix$/;
- if ($p eq substr($l, 0, length $p)) {
- $l =~ s/\.$suffix$//;
- $dirfn = "" unless $dirfn;
- $cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
- dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
- return ($path, "$dirfn$l");
- }
- }
- }
- }
+ while (my $p = shift @parts) {
+ opendir(D, $curdir) or confess "can't open $curdir $!";
+ my @ls = readdir D;
+ closedir D;
+
+ # if this isn't the last part
+ if (@parts) {
+ my $found;
+ foreach my $l (sort @ls) {
+ next if $l =~ /^\./;
+ if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
+ dbg("got dir: $curdir/$l\n") if isdbg('command');
+ $dirfn .= "$l/";
+ $curdir .= "/$l";
+ $found++;
+ last;
+ }
+ }
+ # only proceed if we find the directory asked for
+ return () unless $found;
+ } else {
+ foreach my $l (sort @ls) {
+ next if $l =~ /^\./;
+ next unless $l =~ /\.$suffix$/;
+ if ($p eq substr($l, 0, length $p)) {
+ $l =~ s/\.$suffix$//;
+ $dirfn = "" unless $dirfn;
+ $cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
+ dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
+ return ($path, "$dirfn$l");
+ }
+ }
+ }
+ }
+
return ();
}
$self->local_send('C', $buf);
}
+sub format_dx_spot
+{
+ my $self = shift;
+
+ my $t = ztime($_[2]);
+ my $loc = '';
+ my $clth = $self->{consort} eq 'local' ? 29 : 30;
+ my $comment = substr $_[3], 0, $clth;
+ $comment .= ' ' x ($clth - length($comment));
+ if ($self->{user}->wantgrid) {
+ my $ref = DXUser->get_current($_[4]);
+ if ($ref) {
+ $loc = $ref->qra || '';
+ $loc = ' ' . substr($loc, 0, 4) if $loc;
+ }
+ }
+
+ if ($self->{user}->wantdxitu) {
+ $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8];
+ } elsif ($self->{user}->wantdxcq) {
+ $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9];
+ } elsif ($self->{user}->wantusstate) {
+ $loc = ' ' . $_[13] if $_[13];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12];
+ }
+
+ return sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
+# send a dx spot
+sub dx_spot
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ return unless $self->{dx};
+
+ my ($filter, $hops);
+
+ if ($self->{spotsfilter}) {
+ ($filter, $hops) = $self->{spotsfilter}->it(@_ );
+ return unless $filter;
+ }
+
+ dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+
+ my $buf;
+ if ($self->{ve7cc}) {
+ $buf = VE7CC::dx_spot($self, @_);
+ } else {
+ $buf = $self->format_dx_spot(@_);
+ $buf .= "\a\a" if $self->{beep};
+ $buf =~ s/\%5E/^/g;
+ }
+
+ $self->local_send('X', $buf);
+}
sub wwv
{
return unless $self->{wwv};
if ($self->{wwvfilter}) {
- ($filter, $hops) = $self->{wwvfilter}->it(@_ );
+ ($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_] );
return unless $filter;
}
# are there any to do in this directory?
return unless -d $cmdimportdir;
unless (opendir(DIR, $cmdimportdir)) {
- dbg("can\'t open $cmdimportdir $!");
- Log('err', "can\'t open $cmdimportdir $!");
+ LogDbg('err', "can\'t open $cmdimportdir $!");
return;
}
my $s = Script->new($name, $cmdimportdir);
if ($s) {
-
- dbg("Run import cmd file $name");
- Log('DXCommand', "Run import cmd file $name");
+ LogDbg('DXCommand', "Run import cmd file $name");
my @cat = split /[^A-Za-z0-9]+/, $name;
my ($call) = grep {is_callsign(uc $_)} @cat;
$call ||= $main::mycall;
$dxchan->{priv} = $priv;
$dxchan->{user} = $user;
} else {
- Log('err', "Trying to run import cmd for non-existant user $call");
- dbg( "Trying to run import cmd for non-existant user $call");
+ LogDbg('err', "Trying to run import cmd for non-existant user $call");
}
}
}
$s->erase;
for (@out) {
- Log('DXCommand', "Import cmd $name/$call: $_");
- dbg("Import cmd $name/$call: $_");
+ LogDbg('DXCommand', "Import cmd $name/$call: $_");
}
} else {
- Log("Failed to open $cmdimportdir/$name $!");
- dbg("Failed to open $cmdimportdir/$name $!");
+ LogDbg('err', "Failed to open $cmdimportdir/$name $!");
unlink "$cmdimportdir/$name";
}
}
}
-
1;
__END__
projects / spider.git / blobdiff