+26Aug01=======================================================================
+1. make all newly learned nodes locked out by default.
+2. add lock_nodes.pl which locks out all the nodes in the user file whose
+privilege is 1 or less and which isn't mentioned as an argument to the
+command on the command line.
+3. make set/node, set/spider and their friends unlock a node as well as make
+them one.
+4. Make sh/log et al more efficient / less memory hungry
24Aug01=======================================================================
1. Allow badmsg to reject on interface callsign ('I')
20Aug01=======================================================================
if ($user) {
$user->sort('R');
$user->homenode($call);
+ $user->lockout(0);
$user->priv(1) unless $user->priv;
$user->close();
push @out, $self->msg($create ? 'noderc' : 'noder', $call);
if ($user) {
$user->sort('C');
$user->homenode($call);
+ $user->lockout(0);
$user->priv(1) unless $user->priv;
$user->close();
push @out, $self->msg($create ? 'nodecc' : 'nodec', $call);
if ($user) {
$user->sort('X');
$user->homenode($call);
+ $user->lockout(0);
$user->priv(1) unless $user->priv;
$user->close();
push @out, $self->msg($create ? 'nodexc' : 'nodex', $call);
if ($user) {
$user->sort('A');
$user->homenode($call);
+ $user->lockout(0);
$user->priv(1) unless $user->priv;
$user->close();
push @out, $self->msg($create ? 'nodeac' : 'nodea', $call);
if ($user) {
$user->sort('S');
$user->homenode($call);
+ $user->lockout(0);
$user->priv(1) unless $user->priv;
$user->close();
push @out, $self->msg($create ? 'nodesc' : 'nodes', $call);
sub print
{
my $fcb = $DXLog::log;
- my $from = shift;
- my $to = shift;
+ my $from = shift || 0;
+ my $to = shift || 20;
+ my $count;
my $jdate = $fcb->unixtoj(shift);
my $pattern = shift;
my $who = uc shift;
my @in;
my @out = ();
my $eval;
- my $count;
+ my $tot = $from + $to;
my $hint = "";
if ($pattern) {
- $search = "\$ref->[1] =~ m{^$pattern}i";
- $hint = "m{$pattern}i";
+ $hint = "m{\\Q$pattern\\E}i";
}
if ($who) {
- if ($search) {
- $search .= ' && ';
+ if ($hint) {
$hint .= ' && ';
}
- $search .= "(\$ref->[2] =~ m{$who}i || \$ref->[3] =~ m{$who}i)";
- $hint .= 'm{$who}i';
+ $hint .= 'm{\\Q$who\\E}i';
}
$hint = "next unless $hint" if $hint;
- $search = "1" unless $search;
$eval = qq(
\@in = ();
while (<\$fh>) {
$hint;
chomp;
- \$ref = [ split '\\^' ];
- push \@\$ref, "" unless \@\$ref >= 4;
- push \@in, \$ref;
+ push \@in, \$_;
+ shift \@in, if \@in > $tot;
}
- my \$c;
- for (\$c = \$#in; \$c >= 0; \$c--) {
- \$ref = \$in[\$c];
- if ($search) {
- \$count++;
- next if \$count < $from;
- unshift \@out, print_item(\$ref);
- last if \$count >= \$to; # stop after n
- }
- }
- );
+ );
$fcb->close; # close any open files
my $fh = $fcb->open($jdate);
- for ($count = 0; $count < $to; ) {
+ L1: for ($count = 0; $count < $to; ) {
my $ref;
if ($fh) {
eval $eval; # do the search on this file
- last if $count >= $to; # stop after n
return ("Log search error", $@) if $@;
+ my @tmp;
+ while (@in) {
+ last L1 if $count >= $to;
+ my $ref = [ split /\^/, shift @in ];
+ next if defined $pattern && $ref->[1] ne $pattern;
+ push @tmp, print_item($ref);
+ $count++;
+ }
+ @out = (@tmp, @out);
}
$fh = $fcb->openprev(); # get the next file
last if !$fh;
# remember type of connection
$self->{consort} = $line;
$self->{outbound} = $sort eq 'O';
- $self->{priv} = $user->priv || 1; # other clusters can always be 'normal' users
+ my $priv = $user->priv;
+ $priv = $user->priv(1) unless $priv;
+ $self->{priv} = $priv; # other clusters can always be 'normal' users
$self->{lang} = $user->lang || 'en';
$self->{isolate} = $user->{isolate};
$self->{consort} = $line; # save the connection type
$user = DXUser->new($call);
$user->sort('A');
$user->priv(1); # I have relented and defaulted nodes
- $self->{priv} = 1; # to user RCMDs allowed
+ $user->lockout(1);
$user->homenode($call);
$user->node($call);
}
--- /dev/null
+#!/usr/bin/perl
+#
+# remove all records with the sysop/cluster callsign and recreate
+# it from the information contained in DXVars
+#
+# WARNING - this must be run when the cluster.pl is down!
+#
+# This WILL NOT delete an old sysop call if you are simply
+# changing the callsign.
+#
+# Copyright (c) 1998 Dirk Koopman G1TLH
+#
+# $Id$
+#
+
+# make sure that modules are searched in the order local then perl
+
+BEGIN {
+ # root of directory tree for this system
+ $root = "/spider";
+ $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+
+ unshift @INC, "$root/local";
+}
+
+use DXVars;
+use DXUser;
+
+my $lockfn = "$root/perl/cluster.lck"; # lock file name
+if (-e $lockfn) {
+ open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
+ my $pid = <CLLOCK>;
+ chomp $pid;
+ die "Sorry, Lockfile ($lockfn) and process $pid exist, a cluster is running\n" if kill 0, $pid;
+ close CLLOCK;
+}
+
+my @nodes = map { uc } @ARGV;
+
+DXUser->init($userfn, 1);
+
+my $count;
+my $nodes;
+my @ignore;
+my ($action, $key, $data) = (0,0,0);
+for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
+ if ($data =~ m{sort => '[ACRSX]'}) {
+ my $user = DXUser->get($key);
+ if ($user->is_node) {
+ $nodes ++;
+ if (grep $key eq $_, (@nodes, $mycall)) {
+ push @ignore, $key;
+ next;
+ }
+ my $priv = $user->priv;
+ if ($priv > 1) {
+ push @ignore, $key;
+ next;
+ }
+ $user->priv(1) unless $priv;
+ $user->lockout(1);
+ $user->put;
+ $count++;
+ }
+ }
+}
+
+print "locked out $count nodes out of $nodes\n";
+print scalar @ignore, " nodes ignored (", join(',', @ignore), ")\n";
+print "If there are any nodes missing on the above list then you MUST do\n";
+print "a set/node (set/spider, set/clx etc) on each of them to allow them\n";
+print "to connect to you or you to them\n";
+
+DXUser->finish();
+exit(0);
+
projects / spider.git / commitdiff