add in last config time

[spider.git] / perl / Thingy / Rt.pm

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 5242259c63f82ae5f19d3c5f93376cdbfb457b23..362904d01cac4b311eb2679e379f0afbea16f25e 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -24,12 +24,16 @@ use Thingy;
 use Thingy::RouteFilter;
 use Spot;
 
-use vars qw(@ISA);
+use vars qw(@ISA $update_interval);
 @ISA = qw(Thingy Thingy::RouteFilter);
 
+$update_interval = 30 * 60;            # the interval between 'cf' updates for an interface
+
 sub gen_Aranea
 {
        my $thing = shift;
+       my $dxchan = shift;
+       
        unless ($thing->{Aranea}) {
                my $ref;
                if ($ref = $thing->{anodes}) {
@@ -43,6 +47,7 @@ sub gen_Aranea
                }
                $thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
        }
+       
        return $thing->{Aranea};
 }
 
@@ -76,42 +81,42 @@ sub handle_cf
 {
        my $thing = shift;
        my $dxchan = shift;
-       my $origin = $thing->{origin};
+       my $origin = $thing->{user} || $thing->{origin};
        my $chan_call = $dxchan->{call};
        
        my $parent = Route::Node::get($origin);
        unless ($parent) {
-               dbg("Thingy::Rt::lcf: received from $origin on $chan_call unknown") if isdbg('chanerr');
+               dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr');
                return;
        }
 
        # do nodes
-       my ($del, $add)
+       my ($del, $add);
+       my %in;
        if ($thing->{n}) {
-               my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{n});
+               %in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{n});
                my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
                $add = $tadd;
                $del = $tdel;
        }
        if ($thing->{a}) {
-               my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{a});
+               %in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{a});
                my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
                push @$add, @$tadd;
                push @$del, @$tdel;
        }
-       if (@$add || @$del) {
-               my $call;
-
+       if ($add) {
                my @pc21;
-               foreach $call (@$del) {
+               foreach my $call (@$del) {
                        RouteDB::delete($call, $chan_call);
                        my $ref = Route::Node::get($call);
                        push @pc21, $ref->del($parent) if $ref;
                }
                $thing->{pc21n} = \@pc21 if @pc21;
-               
+       }
+       if ($del) {
                my @pc19;
-               foreach $call (@$add) {
+               foreach my $call (@$add) {
                        RouteDB::update($call, $chan_call);
                        my $ref = Route::Node::get($call);
                        push @pc19, $parent->add($call, 0, $in{$call}) unless $ref;
@@ -121,7 +126,7 @@ sub handle_cf
        
        # now users
        if ($thing->{u}) {
-               my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
+               %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
                ($del, $add) = $parent->diff_users(keys %in);
 
                my $call;
@@ -157,6 +162,7 @@ sub handle_cf
        return $thing;
 }
 
+
 sub _add_user
 {
        my $node = shift;
@@ -191,7 +197,7 @@ sub _upd_user_rec
 # info whenever a node connects and also periodically.
 #
 
-sub new_lcf
+sub new_cf
 {
        my $pkg = shift;
        my $thing = $pkg->SUPER::new(@_);
@@ -221,6 +227,24 @@ sub new_lcf
        return $thing;
 }
 
+# 
+# copy out the PC16 data for a node into the
+# pc16n and u slots if there are any users 
+#
+sub copy_pc16_data
+{
+       my $thing = shift;
+       my $uref = shift;
+
+       $thing->{'s'} = 'cf';
+
+       my @u = $uref->users;
+       if (@u) {
+               $thing->{ausers} = [map {Route::User::get($_)} @u];
+               return scalar @u;
+       }
+       return undef;
+}