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

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 554d171a..8ba7ee00 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -37,7 +37,7 @@ sub gen_Aranea
 		if ($ref = $thing->{anodes}) {
 			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
-		if ($ref = $thing->{anodes}) {
+		if ($ref = $thing->{pnodes}) {
 			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
 		if ($ref = $thing->{ausers}) {
@@ -52,7 +52,9 @@ sub gen_Aranea
 sub from_Aranea
 {
 	my $thing = shift;
-	return unless $thing;
+	$thing->{u} ||= '';
+	$thing->{n} ||= '';
+	$thing->{a} ||= '';
 	return $thing;
 }
 
@@ -79,48 +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 ($del, $add);
 	my %in;
 	if ($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;
+		for (split(/:/, $thing->{n})) {
+			my ($here, $call) = unpack("A1 A*", $_);
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
+		}
 	}
 	if ($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;
+		for (split(/:/, $thing->{a})) {
+			my ($here, $call) = unpack("A1 A*", $_); 
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
+		} 
 	}
-	if ($add) {
-		my @pc21;
+	my ($del, $add) = $parent->diff_nodes(keys %in);
+	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 $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;
 	}
+	$thing->{pc21n} = \@pc21 if @pc21;
+	$thing->{pc19n} = \@pc19 if @pc19;
 	
 	# now users
 	if ($thing->{u}) {
@@ -237,7 +257,7 @@ sub copy_pc16_data
 	$thing->{'s'} = 'cf';
 
 	my @u = map {Route::User::get($_)} $uref->users;
-	$thing->{ausers} = \@u;
+	$thing->{ausers} = \@u if @u;
 	return @u;
 }