X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=71b7a43aba7cd28070aec45b4a375c7c8f9b20e3;hb=6cb729e57be6b6fb1de41428e0bb7457b53d82e8;hp=d7d73f48c5ab77530c613ccc968c68205acbe031;hpb=4d22d5fd3874e8292d82f84a777b99ff7d10402a;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index d7d73f48..71b7a43a 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -1,6 +1,9 @@
 #
 # Route Thingy handling
 #
+# Note that this is a generator of pc(16|17|19|21)n and pc(16|17)u
+# and a consumer of the fpc versions of the above
+#
 # $Id$
 #
 # Copyright (c) 2005 Dirk Koopman G1TLH
@@ -27,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 {$_->{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 {$_->{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;
 }
 
@@ -63,30 +74,141 @@ 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_cf
+{
+	my $thing = shift;
+	my $dxchan = shift;
+	my $origin = $thing->{origin};
+	my $chan_call = $dxchan->{call};
+	
+	my @pc19;
+	my @pc21;
+
+	my $parent = Route::Node::get($origin);
+	unless ($parent) {
+		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 %in;
+	if ($thing->{n}) {
+		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);
+			if ($ref) {
+				push @pc21, grep {$_} $ref->del($parent);
+			}
+		}
+	}
+	if ($add) {
+		foreach my $call (@$add) {
+			next if $call eq $main::mycall;
+			RouteDB::update($call, $chan_call);
+			my $here = $in{$call};
+			push @pc19, grep {$_} $parent->add($call, 0, $here);
+		}
+	}
+	$thing->{pc21n} = \@pc21 if @pc21;
+	$thing->{pc19n} = \@pc19 if @pc19;
+	
+	# now users
+	if ($thing->{u}) {
+		%in = (map {my ($here, $call) = unpack "A1 A*", $_; ($call, $here)} split /:/, $thing->{u});
+		($del, $add) = $parent->diff_users(keys %in);
+
+		my $call;
+
+		my @pc17;
+		foreach $call (@$del) {
+			RouteDB::delete($call, $chan_call);
+			my $ref = Route::User::get($call);
+			if ($ref) {
+				$parent->del_user($ref);
+				push @pc17, $ref;
+			} else {
+				dbg("Thingy::Rt::lcf: del user $call not known, ignored") if isdbg('chanerr');
+				next;
+			}
+		}
+		if (@pc17) {
+			$thing->{pc17n} = $parent;
+			$thing->{pc17u} = \@pc17;
+		}
+	
+		my @pc16;
+		foreach $call (@$add) {
+			RouteDB::update($call, $chan_call);
+			push @pc16, _add_user($parent, $call, $in{$call});
+		}
+		if (@pc16) {
+			$thing->{pc16n} = $parent;
+			$thing->{pc16u} = \@pc16;
+		}
+	}
+
+	return $thing;
+}
+
 
-sub add_user
+sub _add_user
 {
 	my $node = shift;
 	my $user = shift;
 	my $flag = shift;
 	
-	$node->add_user($user, $flag);
-	my $ur = upd_user_rec($user, $node);
+	my @out = $node->add_user($user, $flag);
+	my $ur = _upd_user_rec($user, $node->{call});
 	$ur->put;
+	return @out;
 }
 
-sub upd_user_rec
+sub _upd_user_rec
 {
 	my $call = shift;
 	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;
 	$user->node($parentcall);
-	$user->lastin($main::systime) unless DXChannel->get($call);
+	$user->lastin($main::systime) unless DXChannel::get($call);
 	return $user;
 }
 
@@ -98,30 +220,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 @nodes, $ref if $ref;
+			push @pnodes, $ref if $ref;
+		} elsif ($dxchan->is_aranea) {
+			my $ref = Route::Node::get($dxchan->{call});
+			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;
+}