fix naming

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

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index fe018855286f4a2ca5603e089c6797874d79fd2c..6207635aac912ba03f071aa493d9c4a88c5a1fce 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -76,12 +76,12 @@ 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;
        }
 
@@ -158,6 +158,7 @@ sub handle_cf
        return $thing;
 }
 
+
 sub _add_user
 {
        my $node = shift;
@@ -192,7 +193,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(@_);
@@ -222,6 +223,25 @@ 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->{pc16n} = $uref;
+               $thing->{pc16u} = [map {Route::User::get($_)} @u];
+               return scalar @u;
+       }
+       return undef;
+}