X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=94fa3d1a9ff1549fe2659b69444fef2915c565a9;hb=refs%2Fheads%2Fip_address;hp=6e2c014e80febe2efcd84be9afc6d08b9a67da3e;hpb=ee822fc8bbe6985f708cca37ce3953b83651e542;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 6e2c014e..94fa3d1a 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # package DXUser; @@ -19,12 +19,6 @@ use LRU; use strict; -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; - use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3); %u = (); @@ -61,7 +55,8 @@ $v3 = 0; annok => '9,Accept Announces?,yesno', # accept his announces? lang => '0,Language', hmsgno => '0,Highest Msgno', - group => '0,Chat Group,parray', # used to create a group of users/nodes for some purpose or other + group => '0,Group,parray', # used to create a group of users/nodes for some purpose or other + buddies => '0,Buddies,parray', isolate => '9,Isolate network,yesno', wantbeep => '0,Req Beep,yesno', wantann => '0,Req Announce,yesno', @@ -78,14 +73,14 @@ $v3 = 0; wantlogininfo => '0,Login Info Req,yesno', wantgrid => '0,Show DX Grid,yesno', wantann_talk => '0,Talklike Anns,yesno', - wantpc90 => '1,Req PC90,yesno', - wantnp => '1,Req New Proto,yesno', wantpc16 => '9,Want Users from node,yesno', wantsendpc16 => '9,Send PC16,yesno', wantroutepc19 => '9,Route PC19,yesno', wantusstate => '0,Show US State,yesno', wantdxcq => '0,Show CQ Zone,yesno', wantdxitu => '0,Show ITU Zone,yesno', + wantgtk => '0,Want GTK interface,yesno', + wantpc9x => '0,Want PC9X interface,yesno', lastoper => '9,Last for/oper,cldatetime', nothere => '0,Not Here Text', registered => '9,Registered?,yesno', @@ -94,6 +89,7 @@ $v3 = 0; build => '1,Build', believe => '1,Believable nodes,parray', lastping => '1,Last Ping at,ptimelist', + maxconnect => '1,Max Connections', ); #no strict; @@ -143,7 +139,7 @@ sub init $ufn = "$fn.v3"; $v3 = 1; - $convert++ unless -e $ufn; + $convert++ if -e "$fn.v2" && !-e $ufn; } if ($mode) { @@ -152,10 +148,12 @@ sub init $dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]"; } + die "Cannot open $ufn ($!)\n" unless $dbm; + $lru = LRU->newbase("DXUser", $lrusize); # do a conversion if required - if ($convert) { + if ($dbm && $convert) { my ($key, $val, $action, $count, $err) = ('','',0,0,0); my %oldu; @@ -240,17 +238,25 @@ sub new sub get { - my $pkg = shift; my $call = uc shift; my $data; # is it in the LRU cache? my $ref = $lru->get($call); - return $ref if $ref; + return $ref if $ref && ref $ref eq 'DXUser'; # search for it unless ($dbm->get($call, $data)) { $ref = decode($data); + if ($ref) { + if (ref $ref ne 'DXUser') { + dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring"); + return undef; + } + } else { + dbg("DXUser::get: no reference returned from decode $!"); + return undef; + } $lru->put($call, $ref); return $ref; } @@ -267,14 +273,16 @@ sub get sub get_current { - my $pkg = shift; my $call = uc shift; my $dxchan = DXChannel::get($call); - return $dxchan->user if $dxchan; - my $rref = Route::get($call); - return $rref->user if $rref && exists $rref->{user}; - return $pkg->get($call); + if ($dxchan) { + my $ref = $dxchan->user; + return $ref if ref $ref eq 'DXUser'; + + dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring"); + } + return get($call); } # @@ -295,13 +303,11 @@ sub put my $self = shift; confess "Trying to put nothing!" unless $self && ref $self; my $call = $self->{call}; - # delete all instances of this -# for ($dbm->get_dup($call)) { -# $dbm->del_dup($call, $_); -# } + $dbm->del($call); delete $self->{annok} if $self->{annok}; delete $self->{dxok} if $self->{dxok}; + $lru->put($call, $self); my $ref = $self->encode; $dbm->put($call, $ref); @@ -328,11 +334,20 @@ sub decode sub asc_encode { my $self = shift; - my $dd = new Data::Dumper([$self]); - $dd->Indent(0); - $dd->Terse(1); - $dd->Quotekeys($] < 5.005 ? 1 : 0); - return $dd->Dumpxs; + my $strip = shift; + my $p; + + if ($strip) { + my $ref = bless {}, ref $self; + foreach my $k (qw(qth lat long qra sort call homenode node lastoper lastin)) { + $ref->{$k} = $self->{$k} if exists $self->{$k}; + } + $ref->{name} = $self->{name} if exists $self->{name} && $self->{name} !~ /selfspot/i; + $p = dd($ref); + } else { + $p = dd($self); + } + return $p; } # @@ -342,6 +357,7 @@ sub asc_decode { my $s = shift; my $ref; + $s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; eval '$ref = ' . $s; if ($@) { LogDbg('err', $@); @@ -358,10 +374,6 @@ sub del { my $self = shift; my $call = $self->{call}; - # delete all instances of this -# for ($dbm->get_dup($call)) { -# $dbm->del_dup($call, $_); -# } $lru->remove($call); $dbm->del($call); } @@ -403,13 +415,14 @@ sub fields sub export { my $fn = shift; + my $basic_info_only = shift; # 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"; + 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"; my $count = 0; my $err = 0; @@ -510,7 +523,7 @@ print "There are $count user records and $err errors\n"; } } # only store users that are reasonably active or have useful information - print $fh "$key\t" . $ref->asc_encode . "\n"; + print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n"; ++$count; } else { LogDbg('DXCommand', "Export Error3: $key\t$val"); @@ -585,6 +598,13 @@ sub new_group $self->{group} = [ 'local' ]; } +# set up empty buddies (only happens for them's that connect direct) +sub new_buddies +{ + my $self = shift; + $self->{buddies} = [ ]; +} + # # return a prompt for a field # @@ -686,11 +706,6 @@ sub wantpc16 return _want('pc16', @_); } -sub wantpc90 -{ - return _wantnot('pc90', @_); -} - sub wantsendpc16 { return _want('sendpc16', @_); @@ -716,9 +731,14 @@ sub wantdxitu return _want('dxitu', @_); } -sub wantnp +sub wantgtk { - return _wantnot('np', @_); + return _want('gtk', @_); +} + +sub wantpc9x +{ + return _want('pc9x', @_); } sub wantlogininfo @@ -735,6 +755,12 @@ sub is_node return $self->{sort} =~ /[ACRSX]/; } +sub is_local_node +{ + my $self = shift; + return grep $_ eq 'local_node', @{$self->{group}}; +} + sub is_user { my $self = shift;