fix here

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

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 362904d01cac4b311eb2679e379f0afbea16f25e..89c8452ea56927a9d05bef9414efe45b870a2b4f 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -24,11 +24,9 @@ use Thingy;
 use Thingy::RouteFilter;
 use Spot;
 
-use vars qw(@ISA $update_interval);
+use vars qw(@ISA);
 @ISA = qw(Thingy Thingy::RouteFilter);
 
-$update_interval = 30 * 60;            # the interval between 'cf' updates for an interface
-
 sub gen_Aranea
 {
        my $thing = shift;
@@ -37,13 +35,13 @@ sub gen_Aranea
        unless ($thing->{Aranea}) {
                my $ref;
                if ($ref = $thing->{anodes}) {
-                       $thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+                       $thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
                }
-               if ($ref = $thing->{anodes}) {
-                       $thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+               if ($ref = $thing->{pnodes}) {
+                       $thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
                }
                if ($ref = $thing->{ausers}) {
-                       $thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+                       $thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
                }
                $thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
        }
@@ -54,7 +52,9 @@ sub gen_Aranea
 sub from_Aranea
 {
        my $thing = shift;
-       return unless $thing;
+       $thing->{u} ||= '';
+       $thing->{n} ||= '';
+       $thing->{a} ||= '';
        return $thing;
 }
 
@@ -91,20 +91,20 @@ sub handle_cf
        }
 
        # do nodes
-       my ($del, $add);
        my %in;
        if ($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;
+               for (split(/:/, $thing->{n})) {
+                       my ($here, $call) = unpack("A1 A*", $_); 
+                       $in{$call} = $here;
+               }
        }
        if ($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;
+               for (split(/:/, $thing->{a})) {
+                       my ($here, $call) = unpack("A1 A*", $_); 
+                       $in{$call} = $here;
+               } 
        }
+       my ($del, $add) = $parent->diff_nodes(keys %in);
        if ($add) {
                my @pc21;
                foreach my $call (@$del) {
@@ -118,8 +118,8 @@ sub handle_cf
                my @pc19;
                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;
+                       my $here = $in{$call};
+                       push @pc19, $parent->add($call, 0, $here);
                }
                $thing->{pc19n} = \@pc19 if @pc19;
        }
@@ -238,12 +238,9 @@ sub copy_pc16_data
 
        $thing->{'s'} = 'cf';
 
-       my @u = $uref->users;
-       if (@u) {
-               $thing->{ausers} = [map {Route::User::get($_)} @u];
-               return scalar @u;
-       }
-       return undef;
+       my @u = map {Route::User::get($_)} $uref->users;
+       $thing->{ausers} = \@u if @u;
+       return @u;
 }