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

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index ab831de2..798f0a82 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -18,17 +18,24 @@ use DXChannel;
 use DXDebug;
 use DXUtil;
 use Thingy;
+use Thingy::RouteFilter;
 use Spot;
 
 use vars qw(@ISA);
-@ISA = qw(Thingy);
+@ISA = qw(Thingy Thingy::RouteFilter);
 
 sub gen_Aranea
 {
 	my $thing = shift;
 	unless ($thing->{Aranea}) {
-		my @items;
-	 	$thing->{Aranea} = Aranea::genmsg($thing, 'RT', @items);
+		my $ref;
+		if ($ref = $thing->{anodes}) {
+			$thing->{n} = join(':', map {$_->{call}} @$ref);
+		}
+		if ($ref = $thing->{ausers}) {
+			$thing->{u} = join(':', map {$_->{call}} @$ref);
+		}
+	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(s n u)]);
 	}
  	return $thing->{Aranea};
 }
@@ -40,40 +47,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,113 +63,6 @@ sub handle
 	}
 }
 
-sub handle_eau
-{
-	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::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;
-			}
-		}
-	}
-	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;
-			}
-		}
-	}
-	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;
-		}
-	}
-	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;
-		}
-		$thing->{hops} = $hops if $hops;
-	} elsif ($dxchan->{isolate}) {
-		return;
-	}
-	return 1;
-}
 
 sub add_user
 {
@@ -213,7 +86,43 @@ sub upd_user_rec
 	$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_lcf
+{
+	my $pkg = shift;
+	my $thing = $pkg->SUPER::new(@_);
+	
+	$thing->{'s'} = 'lcf';
+
+	my @nodes;
+	my @users;
+	
+	foreach my $dxchan (DXChannel::get_all()) {
+		if ($dxchan->is_node || $dxchan->is_aranea) {
+			my $ref = Route::Node::get($dxchan->{call});
+			push @nodes, $ref if $ref;
+		} else {
+			my $ref = Route::User::get($dxchan->{call});
+			push @users, $ref if $ref;
+		}
+	}
+	$thing->{anodes} = \@nodes if @nodes;
+	$thing->{ausers} = \@users if @users;
+	return $thing;
+}
+
+
+
+
 1;