X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=86c26ea8d487731e740b8d70808089bf4a113c21;hb=2f4dc5347389ce78ae58567c0c23d09342c65fcd;hp=d06d5a380e0185e0f5f20b2b28a376aee80ec5ff;hpb=eb2a2eb1aa8e7c743c23ec5e0dc5aa40a8708e79;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index d06d5a38..86c26ea8 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -30,23 +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->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+			$thing->{a} = 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 n u)]);
+	 	$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;
 }
 
@@ -69,7 +77,7 @@ sub handle
 # this handles the standard local configuration, it 
 # will reset all the config, make / break links and
 # will generate pc sentences as required for nodes and users
-sub handle_lcf
+sub handle_cf
 {
 	my $thing = shift;
 	my $dxchan = shift;
@@ -78,38 +86,68 @@ sub handle_lcf
 	
 	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 $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);
+		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 %in;
 	if ($thing->{n}) {
-		my %in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{n});
-		my ($del, $add) = $parent->diff_nodes(keys %in);
-
-		my $call;
-
-		my @pc21;
-		foreach $call (@$del) {
+		for (split(/:/, $thing->{n})) {
+			my ($here, $call) = unpack("A1 A*", $_);
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
+		}
+	}
+	if ($thing->{a}) {
+		for (split(/:/, $thing->{a})) {
+			my ($here, $call) = unpack("A1 A*", $_); 
+			next if $call eq $main::mycall;
+			$in{$call} = $here;
+		} 
+	}
+	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;
-		
-		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, $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});
-		my ($del, $add) = $parent->diff_users(keys %in);
+		%in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
+		($del, $add) = $parent->diff_users(keys %in);
 
 		my $call;
 
@@ -144,6 +182,7 @@ sub handle_lcf
 	return $thing;
 }
 
+
 sub _add_user
 {
 	my $node = shift;
@@ -162,7 +201,6 @@ sub _upd_user_rec
 	my $parentcall = shift;
 	
 	# add this station to the user database, if required
-	$call =~ s/-\d+$//o;	# remove ssid for users
 	my $user = DXUser->get_current($call);
 	$user = DXUser->new($call) if !$user;
 	$user->homenode($parentcall) if !$user->homenode;
@@ -179,30 +217,51 @@ 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(@_);
 	
-	$thing->{'s'} = 'lcf';
+	$thing->{'s'} = 'cf';
 
-	my @nodes;
+	my @anodes;
+	my @pnodes;
 	my @users;
 	
 	foreach my $dxchan (DXChannel::get_all()) {
-		if ($dxchan->is_node || $dxchan->is_aranea) {
+		next if $dxchan == $main::me;
+		if ($dxchan->is_node) {
+			my $ref = Route::Node::get($dxchan->{call});
+			push @pnodes, $ref if $ref;
+		} elsif ($dxchan->is_aranea) {
 			my $ref = Route::Node::get($dxchan->{call});
-			push @nodes, $ref if $ref;
+			push @anodes, $ref if $ref;
 		} else {
 			my $ref = Route::User::get($dxchan->{call});
 			push @users, $ref if $ref;
 		}
 	}
-	$thing->{anodes} = \@nodes if @nodes;
+	$thing->{anodes} = \@anodes if @anodes;
+	$thing->{pnodes} = \@pnodes if @pnodes;
 	$thing->{ausers} = \@users if @users;
 	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;
+}