X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=8ba7ee00aac373c70ed8d0f2a0df8499bc3f78d0;hb=f1a23d34defb328c00234aa2b26be931036e4521;hp=49f2bc616cc5167781421c13bf08b811496592d0;hpb=ff16b769e7176ff0121d9993e2edd3f46d53a0e3;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 49f2bc61..8ba7ee00 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -81,52 +81,66 @@ sub handle_cf
 {
 	my $thing = shift;
 	my $dxchan = shift;
-	my $origin = $thing->{user} || $thing->{origin};
+	my $origin = $thing->{origin};
 	my $chan_call = $dxchan->{call};
 	
 	my $parent = Route::Node::get($origin);
 	unless ($parent) {
-		dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr');
+		dbg("Thingy::Rt::cf: received from $origin on $chan_call unknown") if isdbg('chanerr');
 		return;
 	}
+	$parent->np(1);
+	
+	my @pc19;
+	my @pc21;
+
+	# move the origin over to the user, if required
+	if ($thing->{user}) {
+		$origin = $thing->{user};
+		my $ref = Route::Node::get($origin);
+		unless ($ref) {
+			# auto vivify a node that has come that we don't know about
+			push @pc19, $parent->add($origin, 0, 1);
+			$parent = Route::Node::get($origin); # reparent to me now.
+		}
+		$parent->np(1);
+	}
 
 	# do nodes
 	my %in;
 	if ($thing->{n}) {
 		for (split(/:/, $thing->{n})) {
 			my ($here, $call) = unpack("A1 A*", $_);
-			unless ($call eq $main::mycall) {
-				$in{$call} = $here;
-			}
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
 		}
 	}
 	if ($thing->{a}) {
 		for (split(/:/, $thing->{a})) {
 			my ($here, $call) = unpack("A1 A*", $_); 
-			unless ($call eq $main::mycall) {
-				$in{$call} = $here;
-			}
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
 		} 
 	}
 	my ($del, $add) = $parent->diff_nodes(keys %in);
-	if ($add) {
-		my @pc21;
+	if ($del) {
 		foreach my $call (@$del) {
+			next if $call eq $main::mycall;
 			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;
+	if ($add) {
 		foreach my $call (@$add) {
+			next if $call eq $main::mycall;
 			RouteDB::update($call, $chan_call);
 			my $here = $in{$call};
 			push @pc19, $parent->add($call, 0, $here);
 		}
-		$thing->{pc19n} = \@pc19 if @pc19;
 	}
+	$thing->{pc21n} = \@pc21 if @pc21;
+	$thing->{pc19n} = \@pc19 if @pc19;
 	
 	# now users
 	if ($thing->{u}) {