projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort working...
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index e29fe3caefb1eeb393dd1322ff21f99ee3428888..d03a75a447e9b1b8d03a3f491b90fa2c6ae74ad5 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-14,15
+14,21
@@
use Route::User;
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(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
%valid = (
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
%valid = (
- parent => '0,Parent Calls,parray',
- nodes => '0,Nodes,parray',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
+ np => '0,Using New Prot,yesno',
+ lid => '0,Last Msgid',
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-38,6
+44,7
@@
sub count
sub max
{
sub max
{
+ count();
return $max;
}
return $max;
}
@@
-60,12
+67,12
@@
sub add
confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
my $self = get($call);
if ($self) {
confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
my $self = get($call);
if ($self) {
- $self->_add
parent($parent->{call}
);
- $parent->_add
node($call
);
+ $self->_add
link($parent
);
+ $parent->_add
link($self
);
return undef;
}
return undef;
}
- $parent->_addnode($call);
$self = $parent->new($call, @_);
$self = $parent->new($call, @_);
+ $parent->_addlink($self);
return $self;
}
return $self;
}
@@
-82,22
+89,25
@@
sub del
my $pref = shift;
# delete parent from this call's parent list
my $pref = shift;
# delete parent from this call's parent list
- my $pcall = $pref->{call};
- my $ncall = $self->{call};
- $pref->_delnode($ncall);;
- my $ref = $self->_delparent($pcall);
+ $pref->_dellink($self);
+ $self->_dellink($pref);
my @nodes;
my @nodes;
+ my $ncall = $self->{call};
# is this the last connection, I have no parents anymore?
# is this the last connection, I have no parents anymore?
- unless (@
$ref
) {
- foreach my $rcall (@{$self->{
node
s}}) {
+ unless (@
{$self->{links}}
) {
+ foreach my $rcall (@{$self->{
link
s}}) {
next if grep $rcall eq $_, @_;
my $r = Route::Node::get($rcall);
push @nodes, $r->del($self, $ncall, @_) if $r;
}
next if grep $rcall eq $_, @_;
my $r = Route::Node::get($rcall);
push @nodes, $r->del($self, $ncall, @_) if $r;
}
- $self->_del_users;
- delete $list{$self->{call}};
- push @nodes, $self;
+ if ($ncall ne $main::mycall) {
+ $self->_del_users;
+ delete $list{$self->{call}};
+ push @nodes, $self;
+ } else {
+ croak "trying to delete route node";
+ }
}
return @nodes;
}
}
return @nodes;
}
@@
-106,7
+116,9
@@
sub del_nodes
{
my $parent = shift;
my @out;
{
my $parent = shift;
my @out;
- foreach my $rcall (@{$parent->{nodes}}) {
+ foreach my $rcall (@{$parent->{links}}) {
+ next if $rcall eq $parent->{call};
+ next if DXChannel->get($rcall);
my $r = get($rcall);
push @out, $r->del($parent, $parent->{call}, @_) if $r;
}
my $r = get($rcall);
push @out, $r->del($parent, $parent->{call}, @_) if $r;
}
@@
-131,16
+143,17
@@
sub add_user
confess "Trying to add NULL User call to routing tables" unless $ucall;
confess "Trying to add NULL User call to routing tables" unless $ucall;
- $self->_adduser($ucall);
-
- $self->{usercount} = scalar @{$self->{users}};
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
-
$uref->addparent($self->{call}
);
+
@out = $uref->addparent($self
);
} else {
} else {
- @out = Route::User->new($ucall, $self->{call}, @_);
+ $uref = Route::User->new($ucall, $self->{call}, @_);
+ @out = $uref;
}
}
+ $self->_adduser($uref);
+ $self->{usercount} = scalar @{$self->{users}};
+
return @out;
}
return @out;
}
@@
-148,10
+161,16
@@
sub add_user
sub del_user
{
my $self = shift;
sub del_user
{
my $self = shift;
- my $ucall = shift;
- my $ref = Route::User::get($ucall);
- $self->_deluser($ucall);
- my @out = $ref->del($self) if $ref;
+ my $ref = shift;
+ my @out;
+
+ if ($ref) {
+ @out = $self->_deluser($ref);
+ $ref->del($self);
+ } else {
+ confess "tried to delete non-existant $ref->{call} from $self->{call}";
+ }
+ $self->{usercount} = scalar @{$self->{users}};
return @out;
}
return @out;
}
@@
-170,26
+189,12
@@
sub users
return @{$self->{users}};
}
return @{$self->{users}};
}
-sub
node
s
+sub
link
s
{
my $self = shift;
{
my $self = shift;
- return @{$self->{
node
s}};
+ return @{$self->{
link
s}};
}
}
-sub rnodes
-{
- my $self = shift;
- my @out;
- foreach my $call (@{$self->{nodes}}) {
- next if grep $call eq $_, @_;
- push @out, $call;
- my $r = get($call);
- push @out, $r->rnodes($call, @_) if $r;
- }
- return @out;
-}
-
-
sub new
{
my $pkg = shift;
sub new
{
my $pkg = shift;
@@
-198,11
+203,11
@@
sub new
confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
- $self->{
parent
} = ref $pkg ? [ $pkg->{call} ] : [ ];
+ $self->{
links
} = ref $pkg ? [ $pkg->{call} ] : [ ];
$self->{version} = shift;
$self->{flags} = shift;
$self->{users} = [];
$self->{version} = shift;
$self->{flags} = shift;
$self->{users} = [];
- $self->{
nodes} = []
;
+ $self->{
lid} = 0
;
$list{$call} = $self;
$list{$call} = $self;
@@
-223,29
+228,20
@@
sub get_all
return values %list;
}
return values %list;
}
-sub _addparent
-{
- my $self = shift;
- return $self->_addlist('parent', @_);
-}
-
-sub _delparent
+sub newid
{
my $self = shift;
{
my $self = shift;
- return $self->_dellist('parent', @_);
-}
-
-
-sub _addnode
-{
- my $self = shift;
- return $self->_addlist('nodes', @_);
-}
-
-sub _delnode
-{
- my $self = shift;
- return $self->_dellist('nodes', @_);
+ my $id = shift;
+
+ return 0 if $id == $self->{lid};
+ if ($id > $self->{lid}) {
+ $self->{lid} = $id;
+ return 1;
+ } elsif ($self->{lid} - $id > 500) {
+ $self->{id} = $id;
+ return 1;
+ }
+ return 0;
}
}
@@
-277,19
+273,16
@@
sub DESTROY
sub AUTOLOAD
{
no strict;
sub AUTOLOAD
{
no strict;
-
- my $self = shift;
- $name = $AUTOLOAD;
+ my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/
^
.*:://o;
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
-# print "AUTOLOAD: $AUTOLOAD\n";
-# *{$AUTOLOAD} = sub {my $self = shift; @_ ? $self->{$name} = shift : $self->{$name}} ;
- @_ ? $self->{$name} = shift : $self->{$name} ;
+ *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+ goto &$AUTOLOAD;
}
1;
}
1;