X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=362904d01cac4b311eb2679e379f0afbea16f25e;hb=24e7cdb8b2479635fc99952e007bfc6c4c7f6a9a;hp=ab831de286a1dd43132812b2bec961e7d7b31f9a;hpb=27b7373e5eb8d5501c2bd3d960934bc88c2daf82;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index ab831de2..362904d0 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
@@ -18,18 +21,33 @@ use DXChannel;
 use DXDebug;
 use DXUtil;
 use Thingy;
+use Thingy::RouteFilter;
 use Spot;
 
-use vars qw(@ISA);
-@ISA = qw(Thingy);
+use vars qw(@ISA $update_interval);
+@ISA = qw(Thingy Thingy::RouteFilter);
+
+$update_interval = 30 * 60;		# the interval between 'cf' updates for an interface
 
 sub gen_Aranea
 {
 	my $thing = shift;
+	my $dxchan = shift;
+	
 	unless ($thing->{Aranea}) {
-		my @items;
-	 	$thing->{Aranea} = Aranea::genmsg($thing, 'RT', @items);
+		my $ref;
+		if ($ref = $thing->{anodes}) {
+			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+		}
+		if ($ref = $thing->{anodes}) {
+			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+		}
+		if ($ref = $thing->{ausers}) {
+			$thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+		}
+	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
 	}
+	
  	return $thing->{Aranea};
 }
 
@@ -40,40 +58,13 @@ sub from_Aranea
 	return $thing;
 }
 
-sub gen_DXProt
-{
-	my $thing = shift;
-	my $dxchan = shift;
-	return $thing->{DXProt};
-}
-
-#sub gen_DXCommandmode
-#{
-#	my $thing = shift;
-#	my $dxchan = shift;
-#	my $buf;
-#
-#	return $buf;
-#}
-
-sub from_DXProt
-{
-	my $thing = shift;
-	while (@_) {
-		my $k = shift;
-		$thing->{$k} = shift;
-	}
-	($thing->{hops}) = $thing->{DXProt} =~ /\^H(\d+)\^?~?$/ if exists $thing->{DXProt};
-	return $thing;
-}
-
 sub handle
 {
 	my $thing = shift;
 	my $dxchan = shift;
 
-	if ($thing->{t}) {
-		my $sub = "handle_$thing->{t}";
+	if ($thing->{'s'}) {
+		my $sub = "handle_$thing->{s}";
 		if ($thing->can($sub)) {
 			no strict 'refs';
 			$thing = $thing->$sub($dxchan);
@@ -83,137 +74,178 @@ sub handle
 	}
 }
 
-sub handle_eau
+# 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->{user} || $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');
+		return;
+	}
 
-	if (my $d = $thing->{d}) {
-		my $nref;
-		for (split /:/, $d) {
-			my ($type, $here, $call) = unpack "A1 A1 A*", $_;
-			if ($type eq 'U') {
-				unless ($nref) {
-					dbg("Thingy::Rt::ea need a node before $call");
-					return;
-				}
-				add_user($nref, $call, $here);
-				my $h = $dxchan->{call} eq $nref->{call} ? 3 : ($thing->{hops} || 99);
-				RouteDB::update($call, $dxchan->{call}, $h);
-			} elsif ($type eq 'N') {
-				$nref = Route::Node::get($call);
-				unless ($nref) {
-					dbg("Thingy::Rt::ea need a definition for $call");
-					return;
-				}
-				my $h = $dxchan->{call} eq $nref->{call} ? 2 : ($thing->{hops} || 99);
-				RouteDB::update($nref->{call}, $dxchan->{call}, $h);
-			} else {
-				dbg("Thingy::Rt::ea invalid type $type");
-				return;
-			}
+	# 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;
+	}
+	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;
+	}
+	if ($add) {
+		my @pc21;
+		foreach my $call (@$del) {
+			RouteDB::delete($call, $chan_call);
+			my $ref = Route::Node::get($call);
+			push @pc21, $ref->del($parent) if $ref;
 		}
+		$thing->{pc21n} = \@pc21 if @pc21;
 	}
-	return $thing;
-}
-
-sub handle_edu
-{
-	my $thing = shift;
-	my $dxchan = shift;
-
-	if (my $d = $thing->{d}) {
-		my $nref;
-		for (split /:/, $d) {
-			my ($type, $here, $call) = unpack "A1 A1 A*", $_;
-			if ($type eq 'U') {
-				unless ($nref) {
-					dbg("Thingy::Rt::edu need a node before $call");
-					return;
-				}
-				my $uref = Route::User::get($call);
-				unless ($uref) {
-					dbg("Thingy::Rt::edu $call not a user") if isdbg('chanerr');
-					next;
-				}
-				$nref->del_user($uref);
-				RouteDB::delete($call, $dxchan->{call});
-			} elsif ($type eq 'N') {
-				$nref = Route::Node::get($call);
-				unless ($nref) {
-					dbg("Thingy::Rt::ed need a definition for $call");
-					return;
-				}
-				RouteDB::update($nref->{call}, $dxchan->{call}, $dxchan->{call} eq $nref->{call} ? 2 : ($thing->{hops} || 99));
-			} else {
-				dbg("Thingy::Rt::ed invalid type $type");
-				return;
-			}
+	if ($del) {
+		my @pc19;
+		foreach my $call (@$add) {
+			RouteDB::update($call, $chan_call);
+			my $ref = Route::Node::get($call);
+			push @pc19, $parent->add($call, 0, $in{$call}) unless $ref;
 		}
+		$thing->{pc19n} = \@pc19 if @pc19;
 	}
-	return $thing;
-}
-
-sub in_filter
-{
-	my $thing = shift;
-	my $dxchan = shift;
 	
-	# global route filtering on INPUT
-	if ($dxchan->{inroutefilter}) {
-		my $r = Route::Node::get($thing->{origin});
-		my ($filter, $hops) = $dxchan->{inroutefilter}->it($dxchan->{call}, $dxchan->{dxcc}, $dxchan->{itu}, $dxchan->{cq}, $r->{call}, $r->{dxcc}, $r->{itu}, $r->{cq}, $dxchan->{state}, $r->{state});
-		unless ($filter) {
-			dbg("PCPROT: Rejected by input route filter") if isdbg('chanerr');
-			return;
+	# 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;
 		}
-	}
-	return 1;
-}
-
-sub out_filter
-{
-	my $thing = shift;
-	my $dxchan = shift;
 	
-	# global route filtering on OUTPUT
-	if ($dxchan->{routefilter}) {
-		my $r = Route::Node::get($thing->{origin});
-		my ($filter, $hops) = $dxchan->{routefilter}->it($dxchan->{call}, $dxchan->{dxcc}, $dxchan->{itu}, $dxchan->{cq}, $r->{call}, $r->{dxcc}, $r->{itu}, $r->{cq}, $dxchan->{state}, $r->{state});		
-		unless ($filter) {
-			dbg("PCPROT: Rejected by output route filter") if isdbg('chanerr');
-			return;
+		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;
 		}
-		$thing->{hops} = $hops if $hops;
-	} elsif ($dxchan->{isolate}) {
-		return;
 	}
-	return 1;
+
+	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);
 	$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;
 }
+
+#
+# Generate a configuration for onward broadcast
+# 
+# Basically, this creates a thingy with list of nodes and users that
+# are on this node. This the normal method of spreading this
+# info whenever a node connects and also periodically.
+#
+
+sub new_cf
+{
+	my $pkg = shift;
+	my $thing = $pkg->SUPER::new(@_);
+	
+	$thing->{'s'} = 'cf';
+
+	my @anodes;
+	my @pnodes;
+	my @users;
+	
+	foreach my $dxchan (DXChannel::get_all()) {
+		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 @anodes, $ref if $ref;
+		} else {
+			my $ref = Route::User::get($dxchan->{call});
+			push @users, $ref if $ref;
+		}
+	}
+	$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 = $uref->users;
+	if (@u) {
+		$thing->{ausers} = [map {Route::User::get($_)} @u];
+		return scalar @u;
+	}
+	return undef;
+}
+
+
+
 1;