remove any leading ::ffff: on ipv4 addresses

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 419086adaa1230ef09e55772dc7fc17f625195f0..6a06bb3c32baa4278543b32c2764cc8305e264f6 100644 (file)
--- 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;
 
@@ -115,10 +116,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 +125,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 +136,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,7 +158,7 @@ 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) {
@@ -178,9 +177,7 @@ sub init
 
 sub del_file
 {
-       my ($pkg, $fn) = @_;
-  
-       confess "need a filename in User" if !$fn;
+       my $fn = localdata("users");
        $fn .= $v3 ? ".v3" : ".v2";
        unlink $fn;
 }
@@ -191,7 +188,7 @@ sub del_file
 sub process
 {
        if ($main::systime > $lasttime + 15) {
-               $dbm->sync;
+               $dbm->sync if $dbm;
                $lasttime = $main::systime;
        }
 }
@@ -249,13 +246,13 @@ sub get
        unless ($dbm->get($call, $data)) {
                $ref = decode($data);
                if ($ref) {
-                       if (UNIVERSAL::isa($ref, 'DXUser')) {
-                               dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+                       if (!UNIVERSAL::isa($ref, 'DXUser')) {
+                               dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
                                return undef;
                        }
                        # we have a reference and it *is* a DXUser
                } else {
-                       dbg("DXUser::get: no reference returned from decode $!");
+                       dbg("DXUser::get: no reference returned from decode of $call $!");
                        return undef;
                }
                $lru->put($call, $ref);
@@ -281,7 +278,7 @@ sub get_current
                my $ref = $dxchan->user;
                return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
 
-               dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+               dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
        }
        return get($call);
 }
@@ -415,15 +412,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 +456,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 = <CLLOCK>;
@@ -467,9 +466,7 @@ BEGIN {
        }
 }
 
-package DXUser;
-
-use DXVars;
+use SysVar;
 use DXUser;
 
 if (@ARGV) {
@@ -477,8 +474,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;
@@ -494,7 +493,7 @@ while (<DATA>) {
                $err++
        }
 }
-DXUser->sync; DXUser->finish;
+DXUser::sync; DXUser::finish;
 print "There are $count user records and $err errors\n";
 };
                print $fh "__DATA__\n";
@@ -514,7 +513,7 @@ print "There are $count user records and $err errors\n";
                        my $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 $@;
@@ -534,8 +533,10 @@ print "There are $count user records and $err errors\n";
                        }
                } 
         $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 +754,7 @@ sub wantlogininfo
 sub is_node
 {
        my $self = shift;
-       return $self->{sort} =~ /[ACRSX]/;
+       return $self->{sort} =~ /^[ACRSX]$/;
 }
 
 sub is_local_node
@@ -765,7 +766,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