projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplified
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 7371a8690ab781391150847d33b86d02747d0a9e..5f89ac2369f7e28b48bec355ceacb12ad0627278 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-37,6
+37,8
@@
use DB_File;
use VE7CC;
use Thingy;
use Thingy::Dx;
use VE7CC;
use Thingy;
use Thingy::Dx;
+use Thingy::Hello;
+use Thingy::Bye;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
@@
-52,10
+54,8
@@
$msgpolltime = 3600; # the time between polls for new messages
use vars qw($VERSION $BRANCH);
use vars qw($VERSION $BRANCH);
-$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;
+
+main::mkver($VERSION = q$Revision$);
#
# obtain a new connection this is derived from dxchannel
#
# obtain a new connection this is derived from dxchannel
@@
-68,12
+68,11
@@
sub new
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
- my @rout = $main::routeroot->add_user($call,
Route::here(1)
);
+ my @rout = $main::routeroot->add_user($call,
1
);
- # ALWAYS output the user
+
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
-
return $self;
}
return $self;
}
@@
-176,6
+175,11
@@
sub start
$user->lastoper($main::systime + ((int rand(10)) * 86400));
}
$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;
# run a script send the output to the punter
my $script = new Script(lc $call) || new Script('user_default');
$script->run($self) if $script;
@@
-433,8
+437,10
@@
sub run_cmd
$args = "" unless defined $args;
if ($cmd) {
$args = "" unless defined $args;
if ($cmd) {
- # strip out // on command only
+ # strip out //
and ..
on command only
$cmd =~ s|//|/|g;
$cmd =~ s|//|/|g;
+ $cmd =~ s|^/||g; # no leading / either
+ $cmd =~ s|[^-\w/]||g; # and no funny characters
my ($path, $fcmd);
my ($path, $fcmd);
@@
-450,7
+456,7
@@
sub run_cmd
# first expand out the entry to a command
($path, $fcmd) = search($main::localcmd, $cmd, "pl");
# first expand out the entry to a command
($path, $fcmd) = search($main::localcmd, $cmd, "pl");
- ($path, $fcmd) = search($main::cmd, $cmd, "pl")
if !$path || !
$fcmd;
+ ($path, $fcmd) = search($main::cmd, $cmd, "pl")
unless $path &&
$fcmd;
if ($path && $cmd) {
dbg("path: $cmd cmd: $fcmd") if isdbg('command');
if ($path && $cmd) {
dbg("path: $cmd cmd: $fcmd") if isdbg('command');
@@
-496,7
+502,7
@@
sub run_cmd
sub process
{
my $t = time;
sub process
{
my $t = time;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
foreach $dxchan (@dxchan) {
my $dxchan;
foreach $dxchan (@dxchan) {
@@
-542,6
+548,9
@@
sub disconnect
# issue a pc17 to everybody interested
$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
# 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";
}
} else {
confess "trying to disconnect a non existant user $call";
}
@@
-552,6
+561,9
@@
sub disconnect
# send info to all logged in thingies
$self->tell_login('logoutu');
# 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");
$self->SUPER::disconnect;
Log('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
@@
-584,7
+596,7
@@
sub broadcast
my $pkg = shift; # ignored
my $s = shift; # the line to be rebroadcast
my $pkg = shift; # ignored
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel
->
get_all()) {
+ foreach my $dxchan (DXChannel
::
get_all()) {
next unless $dxchan->{sort} eq 'U'; # only interested in user channels
next if grep $dxchan == $_, @_;
$dxchan->send($s); # send it
next unless $dxchan->{sort} eq 'U'; # only interested in user channels
next if grep $dxchan == $_, @_;
$dxchan->send($s); # send it
@@
-594,7
+606,7
@@
sub broadcast
# gimme all the users
sub get_all
{
# gimme all the users
sub get_all
{
- return grep {$_->{sort} eq 'U'} DXChannel
->
get_all();
+ return grep {$_->{sort} eq 'U'} DXChannel
::
get_all();
}
# run a script for this user
}
# run a script for this user
@@
-632,32
+644,33
@@
sub search
my @parts = split '/', $short_cmd;
my $dirfn;
my $curdir = $path;
my @parts = split '/', $short_cmd;
my $dirfn;
my $curdir = $path;
- my $p;
- my $i;
- my @lparts;
- for ($i = 0; $i < @parts; $i++) {
- my $p = $parts[$i];
+ while (my $p = shift @parts) {
opendir(D, $curdir) or confess "can't open $curdir $!";
my @ls = readdir D;
closedir D;
opendir(D, $curdir) or confess "can't open $curdir $!";
my @ls = readdir D;
closedir D;
- my $l;
- foreach $l (sort @ls) {
- next if $l =~ /^\./;
- if ($i < $#parts) { # we are dealing with directories
+
+ # 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";
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;
}
last;
}
- } else { # we are dealing with commands
- @lparts = split /\./, $l;
- next if $lparts[$#lparts] ne $suffix; # only look for .$suffix files
+ }
+ # 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)) {
if ($p eq substr($l, 0, length $p)) {
- pop @lparts; # remove the suffix
- $l = join '.', @lparts;
- # chop $dirfn; # remove trailing /
+ $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');
$dirfn = "" unless $dirfn;
$cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
@@
-890,7
+903,7
@@
sub broadcast_debug
{
my $s = shift; # the line to be rebroadcast
{
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel
->
get_all) {
+ foreach my $dxchan (DXChannel
::
get_all) {
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
$dxchan->send_later('L', $s);
}
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
$dxchan->send_later('L', $s);
}