fix here

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

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 0e6d21c0393272f8602d9fcf1d6c4cb3275d9a3b..89c8452ea56927a9d05bef9414efe45b870a2b4f 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -30,23 +30,31 @@ use vars qw(@ISA);
 sub gen_Aranea
 {
        my $thing = shift;
+       my $dxchan = shift;
+       
        unless ($thing->{Aranea}) {
                my $ref;
                if ($ref = $thing->{anodes}) {
-                       $thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+                       $thing->{a} = 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 n u)]);
+               $thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
        }
+       
        return $thing->{Aranea};
 }
 
 sub from_Aranea
 {
        my $thing = shift;
-       return unless $thing;
+       $thing->{u} ||= '';
+       $thing->{n} ||= '';
+       $thing->{a} ||= '';
        return $thing;
 }
 
@@ -69,47 +77,57 @@ sub handle
 # this handles the standard local configuration, it 
 # will reset all the config, make / break links and
 # will generate pc sentences as required for nodes and users
-sub handle_lcf
+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 %in;
        if ($thing->{n}) {
-               my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{n});
-               my ($del, $add) = $parent->diff_nodes(keys %in);
-
-               my $call;
-
+               for (split(/:/, $thing->{n})) {
+                       my ($here, $call) = unpack("A1 A*", $_); 
+                       $in{$call} = $here;
+               }
+       }
+       if ($thing->{a}) {
+               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 $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;
+                       my $here = $in{$call};
+                       push @pc19, $parent->add($call, 0, $here);
                }
                $thing->{pc19n} = \@pc19 if @pc19;
        }
        
        # now users
        if ($thing->{u}) {
-               my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
-               my ($del, $add) = $parent->diff_users(keys %in);
+               %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
+               ($del, $add) = $parent->diff_users(keys %in);
 
                my $call;
 
@@ -144,6 +162,7 @@ sub handle_lcf
        return $thing;
 }
 
+
 sub _add_user
 {
        my $node = shift;
@@ -178,30 +197,51 @@ 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(@_);
        
-       $thing->{'s'} = 'lcf';
+       $thing->{'s'} = 'cf';
 
-       my @nodes;
+       my @anodes;
+       my @pnodes;
        my @users;
        
        foreach my $dxchan (DXChannel::get_all()) {
-               if ($dxchan->is_node || $dxchan->is_aranea) {
+               next if $dxchan == $main::me;
+               if ($dxchan->is_node) {
                        my $ref = Route::Node::get($dxchan->{call});
-                       push @nodes, $ref if $ref;
+                       push @pnodes, $ref if $ref;
+               } elsif ($dxchan->is_aranea) {
+                       my $ref = Route::Node::get($dxchan->{call});
+                       push @anodes, $ref if $ref;
                } else {
                        my $ref = Route::User::get($dxchan->{call});
                        push @users, $ref if $ref;
                }
        }
-       $thing->{anodes} = \@nodes if @nodes;
+       $thing->{anodes} = \@anodes if @anodes;
+       $thing->{pnodes} = \@pnodes if @pnodes;
        $thing->{ausers} = \@users if @users;
        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 = map {Route::User::get($_)} $uref->users;
+       $thing->{ausers} = \@u if @u;
+       return @u;
+}