projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and also in sh/db0sdx.pl
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index f2abe8047e37b4cba0cc096802d02dd8f3545921..25672f969d7f8502160b1c941f9490c3f0eb4cf5 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-3,7
+3,7
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXUser;
#
package DXUser;
@@
-19,12
+19,6
@@
use LRU;
use strict;
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 = ();
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',
annok => '9,Accept Announces?,yesno', # accept his announces?
lang => '0,Language',
hmsgno => '0,Highest Msgno',
- group => '0,Access 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',
isolate => '9,Isolate network,yesno',
wantbeep => '0,Req Beep,yesno',
wantann => '0,Req Announce,yesno',
@@
-75,20
+70,26
@@
$v3 = 0;
pagelth => '0,Current Pagelth',
pingint => '9,Node Ping interval',
nopings => '9,Ping Obs Count',
pagelth => '0,Current Pagelth',
pingint => '9,Node Ping interval',
nopings => '9,Ping Obs Count',
- wantlogininfo => '
9,Login info r
eq,yesno',
- wantgrid => '0,
DX Grid Info
,yesno',
+ wantlogininfo => '
0,Login Info R
eq,yesno',
+ wantgrid => '0,
Show DX Grid
,yesno',
wantann_talk => '0,Talklike Anns,yesno',
wantann_talk => '0,Talklike Anns,yesno',
- wantpc90 => '1,Req PC90,yesno',
- wantnp => '1,Req New Protocol,yesno',
wantpc16 => '9,Want Users from node,yesno',
wantsendpc16 => '9,Send PC16,yesno',
wantroutepc19 => '9,Route PC19,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',
prompt => '0,Required Prompt',
version => '1,Version',
build => '1,Build',
lastoper => '9,Last for/oper,cldatetime',
nothere => '0,Not Here Text',
registered => '9,Registered?,yesno',
prompt => '0,Required Prompt',
version => '1,Version',
build => '1,Build',
+ believe => '1,Believable nodes,parray',
+ lastping => '1,Last Ping at,ptimelist',
+ maxconnect => '1,Max Connections',
);
#no strict;
);
#no strict;
@@
-138,7
+139,7
@@
sub init
$ufn = "$fn.v3";
$v3 = 1;
$ufn = "$fn.v3";
$v3 = 1;
- $convert++
unless
-e $ufn;
+ $convert++
if -e "$fn.v2" && !
-e $ufn;
}
if ($mode) {
}
if ($mode) {
@@
-147,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?]";
}
$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
$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;
my ($key, $val, $action, $count, $err) = ('','',0,0,0);
my %oldu;
@@
-207,17
+210,23
@@
sub finish
# new - create a new user
#
# new - create a new user
#
-sub
new
+sub
alloc
{
my $pkg = shift;
my $call = uc shift;
{
my $pkg = shift;
my $call = uc shift;
+ my $self = bless {call => $call, 'sort'=>'U'}, $pkg;
+ return $self;
+}
+
+sub new
+{
+ my $pkg = shift;
+ my $call = shift;
# $call =~ s/-\d+$//o;
# confess "can't create existing call $call in User\n!" if $u{$call};
# $call =~ s/-\d+$//o;
# confess "can't create existing call $call in User\n!" if $u{$call};
- my $self = bless {}, $pkg;
- $self->{call} = $call;
- $self->{'sort'} = 'U';
+ my $self = $pkg->alloc($call);
$self->put;
return $self;
}
$self->put;
return $self;
}
@@
-229,17
+238,26
@@
sub new
sub get
{
sub get
{
- my $pkg = shift;
my $call = uc shift;
my $data;
# is it in the LRU cache?
my $ref = $lru->get($call);
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);
# search for it
unless ($dbm->get($call, $data)) {
$ref = decode($data);
+ if ($ref) {
+ 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 of $call $!");
+ return undef;
+ }
$lru->put($call, $ref);
return $ref;
}
$lru->put($call, $ref);
return $ref;
}
@@
-256,14
+274,16
@@
sub get
sub get_current
{
sub get_current
{
- my $pkg = shift;
my $call = uc 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);
+ my $dxchan = DXChannel::get($call);
+ if ($dxchan) {
+ my $ref = $dxchan->user;
+ return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
+
+ dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+ }
+ return get($call);
}
#
}
#
@@
-284,13
+304,11
@@
sub put
my $self = shift;
confess "Trying to put nothing!" unless $self && ref $self;
my $call = $self->{call};
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};
$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);
$lru->put($call, $self);
my $ref = $self->encode;
$dbm->put($call, $ref);
@@
-317,11
+335,20
@@
sub decode
sub asc_encode
{
my $self = shift;
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;
}
#
}
#
@@
-331,10
+358,10
@@
sub asc_decode
{
my $s = shift;
my $ref;
{
my $s = shift;
my $ref;
+ $s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
eval '$ref = ' . $s;
if ($@) {
eval '$ref = ' . $s;
if ($@) {
- dbg($@);
- Log('err', $@);
+ LogDbg('err', $@);
$ref = undef;
}
return $ref;
$ref = undef;
}
return $ref;
@@
-348,10
+375,6
@@
sub del
{
my $self = shift;
my $call = $self->{call};
{
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);
}
$lru->remove($call);
$dbm->del($call);
}
@@
-393,13
+416,14
@@
sub fields
sub export
{
my $fn = shift;
sub export
{
my $fn = shift;
+ my $basic_info_only = shift;
# save old ones
# 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;
my $count = 0;
my $err = 0;
@@
-477,29
+501,33
@@
print "There are $count user records and $err errors\n";
for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) {
if (!is_callsign($key) || $key =~ /^0/) {
for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) {
if (!is_callsign($key) || $key =~ /^0/) {
- Log('DXCommand', "Export Error1: $key\t$val");
+ my $eval = $val;
+ my $ekey = $key;
+ $eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+ $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+ LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
eval {$dbm->del($key)};
eval {$dbm->del($key)};
- dbg(carp("Export Error1: $
key\t$
val\n$@")) if $@;
+ dbg(carp("Export Error1: $
ekey\t$e
val\n$@")) if $@;
++$err;
next;
}
my $ref = decode($val);
if ($ref) {
my $t = $ref->{lastin} || 0;
++$err;
next;
}
my $ref = decode($val);
if ($ref) {
my $t = $ref->{lastin} || 0;
- if ($main::systime > $t + $tooold) {
+ if ($
ref->{sort} eq 'U' && !$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 $@;
unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
eval {$dbm->del($key)};
dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
- Log('DXCommand', "$ref->{call} deleted, too old");
+ Log
Dbg
('DXCommand', "$ref->{call} deleted, too old");
$del++;
next;
}
}
# only store users that are reasonably active or have useful information
$del++;
next;
}
}
# 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 {
++$count;
} else {
- Log('DXCommand', "Export Error3: $key\t$val");
+ Log
Dbg
('DXCommand', "Export Error3: $key\t$val");
eval {$dbm->del($key)};
dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
++$err;
eval {$dbm->del($key)};
dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
++$err;
@@
-571,6
+599,13
@@
sub new_group
$self->{group} = [ 'local' ];
}
$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
#
#
# return a prompt for a field
#
@@
-589,6
+624,8
@@
sub sort
}
# some accessors
}
# some accessors
+
+# want is default = 1
sub _want
{
my $n = shift;
sub _want
{
my $n = shift;
@@
-599,6
+636,17
@@
sub _want
return exists $self->{$s} ? $self->{$s} : 1;
}
return exists $self->{$s} ? $self->{$s} : 1;
}
+# wantnot is default = 0
+sub _wantnot
+{
+ my $n = shift;
+ my $self = shift;
+ my $val = shift;
+ my $s = "want$n";
+ $self->{$s} = $val if defined $val;
+ return exists $self->{$s} ? $self->{$s} : 0;
+}
+
sub wantbeep
{
return _want('beep', @_);
sub wantbeep
{
return _want('beep', @_);
@@
-669,6
+717,31
@@
sub wantroutepc16
return _want('routepc16', @_);
}
return _want('routepc16', @_);
}
+sub wantusstate
+{
+ return _want('usstate', @_);
+}
+
+sub wantdxcq
+{
+ return _want('dxcq', @_);
+}
+
+sub wantdxitu
+{
+ return _want('dxitu', @_);
+}
+
+sub wantgtk
+{
+ return _want('gtk', @_);
+}
+
+sub wantpc9x
+{
+ return _want('pc9x', @_);
+}
+
sub wantlogininfo
{
my $self = shift;
sub wantlogininfo
{
my $self = shift;
@@
-683,6
+756,12
@@
sub is_node
return $self->{sort} =~ /[ACRSX]/;
}
return $self->{sort} =~ /[ACRSX]/;
}
+sub is_local_node
+{
+ my $self = shift;
+ return grep $_ eq 'local_node', @{$self->{group}};
+}
+
sub is_user
{
my $self = shift;
sub is_user
{
my $self = shift;
@@
-736,6
+815,41
@@
sub unset_passphrase
my $self = shift;
delete $self->{passphrase};
}
my $self = shift;
delete $self->{passphrase};
}
+
+sub set_believe
+{
+ my $self = shift;
+ my $call = uc shift;
+ $self->{believe} ||= [];
+ push @{$self->{believe}}, $call unless grep $_ eq $call, @{$self->{believe}};
+}
+
+sub unset_believe
+{
+ my $self = shift;
+ my $call = uc shift;
+ if (exists $self->{believe}) {
+ $self->{believe} = [grep {$_ ne $call} @{$self->{believe}}];
+ delete $self->{believe} unless @{$self->{believe}};
+ }
+}
+
+sub believe
+{
+ my $self = shift;
+ return exists $self->{believe} ? @{$self->{believe}} : ();
+}
+
+sub lastping
+{
+ my $self = shift;
+ my $call = shift;
+ $self->{lastping} ||= {};
+ $self->{lastping} = {} unless ref $self->{lastping};
+ my $b = $self->{lastping};
+ $b->{$call} = shift if @_;
+ return $b->{$call};
+}
1;
__END__
1;
__END__