X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=71b7a43aba7cd28070aec45b4a375c7c8f9b20e3;hb=f942dabdab73e5841f16ead2a41a52d6b5b05eb8;hp=5242259c63f82ae5f19d3c5f93376cdbfb457b23;hpb=2b4d1b892fcb8f360724f19c98500222c897c46a;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 5242259c..71b7a43a 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -30,26 +30,31 @@ use vars qw(@ISA);
 sub gen_Aranea
 {
 	my $thing = shift;
+	my $dxchan = shift;
+	
 	unless ($thing->{Aranea}) {
 		my $ref;
 		if ($ref = $thing->{anodes}) {
-			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
-		if ($ref = $thing->{anodes}) {
-			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+		if ($ref = $thing->{pnodes}) {
+			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
 		if ($ref = $thing->{ausers}) {
-			$thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+			$thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
 	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
 	}
+	
  	return $thing->{Aranea};
 }
 
 sub from_Aranea
 {
 	my $thing = shift;
-	return unless $thing;
+	$thing->{u} ||= '';
+	$thing->{n} ||= '';
+	$thing->{a} ||= '';
 	return $thing;
 }
 
@@ -79,49 +84,72 @@ sub handle_cf
 	my $origin = $thing->{origin};
 	my $chan_call = $dxchan->{call};
 	
+	my @pc19;
+	my @pc21;
+
 	my $parent = Route::Node::get($origin);
 	unless ($parent) {
-		dbg("Thingy::Rt::lcf: received from $origin on $chan_call unknown") if isdbg('chanerr');
-		return;
+		dbg("Thingy::Rt::cf: new (unconnected) node $origin arrived") if isdbg('chanerr');
+		$parent = Route::Node::new($origin, 0, 1);
+		push @pc19, $parent;
+	}
+	$parent->np(1);
+	
+	# move the origin over to the user, if required
+	if ($thing->{user}) {
+		$origin = $thing->{user};
+		my $ref = Route::Node::get($origin);
+		if ($ref) {
+			$parent = $ref;
+		} else {
+			# 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}) {
-		my %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}) {
-		my %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 || @$del) {
-		my $call;
-
-		my @pc21;
-		foreach $call (@$del) {
+	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;
+			if ($ref) {
+				push @pc21, grep {$_} $ref->del($parent);
+			}
 		}
-		$thing->{pc21n} = \@pc21 if @pc21;
-		
-		my @pc19;
-		foreach $call (@$add) {
+	}
+	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, grep {$_} $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}) {
-		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 +185,7 @@ sub handle_cf
 	return $thing;
 }
 
+
 sub _add_user
 {
 	my $node = shift;
@@ -164,7 +193,7 @@ sub _add_user
 	my $flag = shift;
 	
 	my @out = $node->add_user($user, $flag);
-	my $ur = _upd_user_rec($user, $node);
+	my $ur = _upd_user_rec($user, $node->{call});
 	$ur->put;
 	return @out;
 }
@@ -191,7 +220,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 +250,21 @@ 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 = map {Route::User::get($_)} $uref->users;
+	$thing->{ausers} = \@u if @u;
+	return @u;
+}