X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=4b533445a68ee42e1ce5dba88c80e473b86d33cc;hb=1b51ec2cbffe9df6d7650d3daabec0885ddd7695;hp=fe018855286f4a2ca5603e089c6797874d79fd2c;hpb=4fc210b748591e07ec7a862e29e14c535975de27;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index fe018855..4b533445 100644
--- 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;
 	}
 
@@ -100,19 +100,18 @@ sub handle_cf
 		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;
@@ -158,6 +157,7 @@ sub handle_cf
 	return $thing;
 }
 
+
 sub _add_user
 {
 	my $node = shift;
@@ -192,7 +192,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 +222,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;
+}