recover from removal of newline characters!

[spider.git] / perl / Route / Node.pm

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index f80e58e324ce5c8e19050d6b03537602fee12777..e17b01f8858feaf4aee5f965c71bb6bf79fbf48a 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -4,17 +4,18 @@
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
 # $Id$
-# 
+#
 
 package Route::Node;
 
 use DXDebug;
 use Route;
 use Route::User;
+use DXUtil;
 
 use strict;
 
-use vars qw(%list %valid @ISA $max $filterdef);
+use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
 %valid = (
@@ -26,11 +27,15 @@ use vars qw(%list %valid @ISA $max $filterdef);
                  handle_xml => '0,Using XML,yesno',
                  lastmsg => '0,Last Route Msg,atime',
                  lastid => '0,Last Route MsgID',
+                 do_pc9x => '0,Uses pc9x,yesno',
+                 via_pc92 => '0,Came in via pc92,yesno',
+                 obscount => '0,Obscount',
 );
 
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
+$obscount = 3;
 
 sub count
 {
@@ -54,7 +59,7 @@ sub max
 # object with that callsign. The upper layers are expected to do something
 # sensible with this!
 #
-# called as $parent->add(call, dxchan, version, flags) 
+# called as $parent->add(call, dxchan, version, flags)
 #
 
 sub add
@@ -90,7 +95,7 @@ sub del
     $self->_delparent($pref);
        my @nodes;
        my $ncall = $self->{call};
-       
+
        # is this the last connection, I have no parents anymore?
        unless (@{$self->{parent}}) {
                foreach my $rcall (@{$self->{nodes}}) {
@@ -111,7 +116,7 @@ sub delete
 {
        my $self = shift;
        my @out;
-       
+
        $self->_del_users;
        foreach my $call (@{$self->{parent}}) {
                my $parent = Route::Node::get($call);
@@ -169,7 +174,7 @@ sub del_user
        my $self = shift;
        my $ref = shift;
        my @out;
-       
+
        if ($ref) {
                @out = $self->_deluser($ref);
                $ref->del($self);
@@ -220,23 +225,57 @@ sub rnodes
        return @out;
 }
 
+# this takes in a list of node and user calls (not references) from
+# a config type update for a node and returns
+# the differences as lists of things that have gone away
+# and things that have been added.
+sub calc_config_changes
+{
+       my $self = shift;
+       my %nodes = map {$_ => 1} @{$self->{nodes}};
+       my %users = map {$_ => 1} @{$self->{users}};
+       my $cnodes = shift;
+       my $cusers = shift;
+       if (isdbg('route')) {
+               dbg("ROUTE: start calc_config_changes");
+               dbg("ROUTE: incoming nodes on $self->{call}: " . join(',', sort @$cnodes));
+               dbg("ROUTE: incoming users on $self->{call}: " . join(',', sort @$cusers));
+               dbg("ROUTE: existing nodes on $self->{call}: " . join(',', sort keys %nodes));
+               dbg("ROUTE: existing users on $self->{call}: " . join(',', sort keys %users));
+       }
+       my (@dnodes, @dusers, @nnodes, @nusers);
+       push @nnodes, map {my @r = $nodes{$_} ? () : $_; delete $nodes{$_}; @r} @$cnodes;
+       push @dnodes, keys %nodes;
+       push @nusers, map {my @r = $users{$_} ? () : $_; delete $users{$_}; @r} @$cusers;
+       push @dusers, keys %users;
+       if (isdbg('route')) {
+               dbg("ROUTE: deleted nodes on $self->{call}: " . join(',', sort @dnodes));
+               dbg("ROUTE: deleted users on $self->{call}: " . join(',', sort @dusers));
+               dbg("ROUTE: added nodes on $self->{call}: " . join(',', sort  @nnodes));
+               dbg("ROUTE: added users on $self->{call}: " . join(',', sort @nusers));
+               dbg("ROUTE: end calc_config_changes");
+       }
+       return (\@dnodes, \@dusers, \@nnodes, \@nusers);
+}
 
 sub new
 {
        my $pkg = shift;
        my $call = uc shift;
-       
+
        confess "already have $call in $pkg" if $list{$call};
-       
+
        my $self = $pkg->SUPER::new($call);
        $self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
-       $self->{version} = shift;
-       $self->{flags} = shift;
+       $self->{version} = shift || 5401;
+       $self->{flags} = shift || Route::here(1);
        $self->{users} = [];
        $self->{nodes} = [];
-       
+       $self->{lastid} = {};
+       $self->reset_obs;                       # by definition
+
        $list{$call} = $self;
-       
+
        return $self;
 }
 
@@ -292,12 +331,25 @@ sub _deluser
     return $self->_dellist('users', @_);
 }
 
+sub dec_obs
+{
+       my $self = shift;
+       $self->{obscount}--;
+       return $self->{obscount};
+}
+
+sub reset_obs
+{
+       my $self = shift;
+       $self->{obscount} = $obscount;
+}
+
 sub DESTROY
 {
        my $self = shift;
        my $pkg = ref $self;
        my $call = $self->{call} || "Unknown";
-       
+
        dbg("destroying $pkg with $call") if isdbg('routelow');
 }
 
@@ -311,7 +363,7 @@ sub AUTOLOAD
        my $name = $AUTOLOAD;
        return if $name =~ /::DESTROY$/;
        $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