X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=b33f882384e63d161a18ecd0a8cfecca2f3b4837;hb=e2ca7811e49048bfad82ec31e148a79fe9904e2b;hp=25672f969d7f8502160b1c941f9490c3f0eb4cf5;hpb=a50f4484d80f17f29aed57f2d5bae02662cd15a2;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 25672f96..b33f8823 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -16,6 +16,7 @@ use IO::File; use DXDebug; use DXUtil; use LRU; +use File::Copy; use strict; @@ -29,6 +30,7 @@ $lasttime = 0; $lrusize = 2000; $tooold = 86400 * 365; # this marks an old user who hasn't given enough info to be useful $v3 = 0; +our $maxconnlist = 3; # remember this many connection time (duration) [start, end] pairs # hash of valid elements and a simple prompt %valid = ( @@ -81,6 +83,12 @@ $v3 = 0; wantdxitu => '0,Show ITU Zone,yesno', wantgtk => '0,Want GTK interface,yesno', wantpc9x => '0,Want PC9X interface,yesno', + wantrbn => '0,Want RBN spots,yesno', + wantft => '0,Want RBN FT4/8,yesno', + wantcw => '0,Want RBN CW,yesno', + wantrtty => '0,Want RBN RTTY,yesno', + wantpsk => '0,Want RBN PSK,yesno', + wantbeacon => '0,Want (RBN) Beacon,yesno', lastoper => '9,Last for/oper,cldatetime', nothere => '0,Not Here Text', registered => '9,Registered?,yesno', @@ -90,6 +98,8 @@ $v3 = 0; believe => '1,Believable nodes,parray', lastping => '1,Last Ping at,ptimelist', maxconnect => '1,Max Connections', + startt => '0,Start Time,cldatetime', + connlist => '1,Connections,parraydifft', ); #no strict; @@ -115,10 +125,8 @@ sub AUTOLOAD # sub init { - my ($pkg, $fn, $mode) = @_; + my $mode = shift; - confess "need a filename in User" if !$fn; - my $ufn; my $convert; @@ -126,10 +134,10 @@ sub init require Storable; }; -# eval "use Storable qw(nfreeze thaw)"; + my $fn = "users"; if ($@) { - $ufn = "$fn.v2"; + $ufn = localdata("users.v2"); $v3 = $convert = 0; dbg("the module Storable appears to be missing!!"); dbg("trying to continue in compatibility mode (this may fail)"); @@ -137,9 +145,9 @@ sub init } else { import Storable qw(nfreeze thaw); - $ufn = "$fn.v3"; + $ufn = localdata("users.v3"); $v3 = 1; - $convert++ if -e "$fn.v2" && !-e $ufn; + $convert++ if -e localdata("users.v2") && !-e $ufn; } if ($mode) { @@ -159,14 +167,19 @@ sub init my %oldu; dbg("Converting the User File to V3 "); dbg("This will take a while, I suggest you go and have cup of strong tea"); - my $odbm = tie (%oldu, 'DB_File', "$fn.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]"; + my $odbm = tie (%oldu, 'DB_File', localdata("users.v2"), O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]"; for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) { - my $ref = asc_decode($val); - if ($ref) { - $ref->put; - $count++; + my $ref; + eval { $ref = asc_decode($val) }; + unless ($@) { + if ($ref) { + $ref->put; + $count++; + } else { + $err++ + } } else { - $err++ + Log('err', "DXUser: error decoding $@"); } } undef $odbm; @@ -178,11 +191,9 @@ sub init sub del_file { - my ($pkg, $fn) = @_; - - confess "need a filename in User" if !$fn; - $fn .= $v3 ? ".v3" : ".v2"; - unlink $fn; + # with extreme prejudice + unlink "$main::data/users.v3"; + unlink "$main::local_data/users.v3"; } # @@ -191,7 +202,7 @@ sub del_file sub process { if ($main::systime > $lasttime + 15) { - $dbm->sync; + $dbm->sync if $dbm; $lasttime = $main::systime; } } @@ -247,7 +258,8 @@ sub get # search for it unless ($dbm->get($call, $data)) { - $ref = decode($data); + eval { $ref = decode($data); }; + if ($ref) { if (!UNIVERSAL::isa($ref, 'DXUser')) { dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring"); @@ -255,7 +267,11 @@ sub get } # we have a reference and it *is* a DXUser } else { - dbg("DXUser::get: no reference returned from decode of $call $!"); + if ($@) { + LogDbg('err', "DXUser::get decode error on $call '$@'"); + } else { + dbg("DXUser::get: no reference returned from decode of $call $!"); + } return undef; } $lru->put($call, $ref); @@ -326,7 +342,9 @@ sub encode sub decode { goto &asc_decode unless $v3; - return thaw(shift); + my $ref; + $ref = thaw(shift); + return $ref; } # @@ -361,7 +379,7 @@ sub asc_decode $s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; eval '$ref = ' . $s; if ($@) { - LogDbg('err', $@); + LogDbg('err', "DXUser::asc_decode: on '$s' $@"); $ref = undef; } return $ref; @@ -386,7 +404,14 @@ sub del sub close { my $self = shift; - $self->{lastin} = time; + my $startt = shift; + my $ip = shift; + $self->{lastin} = $main::systime; + # add a record to the connect list + my $ref = [$startt || $self->{startt}, $main::systime]; + push @$ref, $ip if $ip; + push @{$self->{connlist}}, $ref; + shift @{$self->{connlist}} if @{$self->{connlist}} > $maxconnlist; $self->put(); } @@ -415,15 +440,17 @@ sub fields sub export { - my $fn = shift; + my $name = shift || 'user_asc'; my $basic_info_only = shift; + + my $fn = $name ne 'user_asc' ? $name : "$main::local_data/$name"; # force use of local # save old ones - rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo"; - rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo"; - rename "$fn.oo", "$fn.ooo" if -e "$fn.oo"; - rename "$fn.o", "$fn.oo" if -e "$fn.o"; - rename "$fn", "$fn.o" if -e "$fn"; + move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo"; + move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo"; + move "$fn.oo", "$fn.ooo" if -e "$fn.oo"; + move "$fn.o", "$fn.oo" if -e "$fn.o"; + move "$fn", "$fn.o" if -e "$fn"; my $count = 0; my $err = 0; @@ -457,7 +484,7 @@ BEGIN { # try to detect a lockfile (this isn't atomic but # should do for now - $lockfn = "$root/local/cluster.lck"; # lock file name + $lockfn = "$root/local_data/cluster.lck"; # lock file name if (-e $lockfn) { open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!"; my $pid = ; @@ -467,9 +494,7 @@ BEGIN { } } -package DXUser; - -use DXVars; +use SysVar; use DXUser; if (@ARGV) { @@ -477,8 +502,10 @@ if (@ARGV) { print "user filename now $userfn\n"; } -DXUser->del_file($main::userfn); -DXUser->init($main::userfn, 1); +package DXUser; + +del_file(); +init(1); %u = (); my $count = 0; my $err = 0; @@ -489,12 +516,13 @@ while () { if ($ref) { $ref->put(); $count++; + DXUser::sync() unless $count % 10000; } else { print "# Error: $f[0]\t$f[1]\n"; $err++ } } -DXUser->sync; DXUser->finish; +DXUser::sync(); DXUser::finish(); print "There are $count user records and $err errors\n"; }; print $fh "__DATA__\n"; @@ -511,10 +539,11 @@ print "There are $count user records and $err errors\n"; ++$err; next; } - my $ref = decode($val); + my $ref; + eval {$ref = decode($val); }; if ($ref) { my $t = $ref->{lastin} || 0; - if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) { + if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) { unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) { eval {$dbm->del($key)}; dbg(carp("Export Error2: $key\t$val\n$@")) if $@; @@ -527,15 +556,17 @@ print "There are $count user records and $err errors\n"; print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n"; ++$count; } else { - LogDbg('DXCommand', "Export Error3: $key\t$val"); + LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@"); eval {$dbm->del($key)}; dbg(carp("Export Error3: $key\t$val\n$@")) if $@; ++$err; } } $fh->close; - } - return "$count Users $del Deleted $err Errors ('sh/log Export' for details)"; + } + my $s = qq{Exported users to $fn - $count Users $del Deleted $err Errors ('sh/log Export' for details)}; + LogDbg('command', $s); + return $s; } # @@ -753,7 +784,7 @@ sub wantlogininfo sub is_node { my $self = shift; - return $self->{sort} =~ /[ACRSX]/; + return $self->{sort} =~ /^[ACRSX]$/; } sub is_local_node @@ -765,7 +796,13 @@ sub is_local_node sub is_user { my $self = shift; - return $self->{sort} eq 'U'; + return $self->{sort} =~ /^[UW]$/; +} + +sub is_web +{ + my $self = shift; + return $self->{sort} eq 'W'; } sub is_bbs @@ -804,6 +841,12 @@ sub is_ak1a return $self->{sort} eq 'A'; } +sub is_rbn +{ + my $self = shift; + return $self->{sort} eq 'N' +} + sub unset_passwd { my $self = shift;