X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FThingy%2FRt.pm;h=6207635aac912ba03f071aa493d9c4a88c5a1fce;hb=4f2b8661933ee3e3ccda2596d30485d98dd18ecb;hp=5242259c63f82ae5f19d3c5f93376cdbfb457b23;hpb=2b4d1b892fcb8f360724f19c98500222c897c46a;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 5242259c..6207635a 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -76,25 +76,26 @@ 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;
@@ -121,7 +122,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 +158,7 @@ sub handle_cf
 	return $thing;
 }
 
+
 sub _add_user
 {
 	my $node = shift;
@@ -191,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(@_);
@@ -221,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;
+}