add all the basic aranea routing + local configuration broadcasts

[spider.git] / perl / Thingy / Rt.pm

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 3a453a26eec6a41198d8892fed37b50c51213024..d7d73f48c5ab77530c613ccc968c68205acbe031 100644 (file)
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -11,26 +11,31 @@ use strict;
 package Thingy::Rt;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 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, 'Rloc', @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};
 }
@@ -42,73 +47,82 @@ sub from_Aranea
        return $thing;
 }
 
-sub gen_DXProt
-{
-       my $thing = shift;
-       my $dxchan = shift;
-       return $thing->{DXProt};
-}
-
-sub gen_DXCommandmode
+sub handle
 {
        my $thing = shift;
        my $dxchan = shift;
-       my $buf;
 
-       return $buf;
-}
+       if ($thing->{'s'}) {
+               my $sub = "handle_$thing->{s}";
+               if ($thing->can($sub)) {
+                       no strict 'refs';
+                       $thing = $thing->$sub($dxchan);
+               }
 
-sub from_DXProt
-{
-       my $thing = shift;
-       while (@_) {
-               my $k = shift;
-               $thing->{$k} = shift;
+               $thing->broadcast($dxchan) if $thing;
        }
-       ($thing->{hops}) = $thing->{DXProt} =~ /\^H(\d+)\^?~?$/ if exists $thing->{DXProt};
-       return $thing;
 }
 
-sub handle
-{
-       my $thing = shift;
-       my $dxchan = shift;
 
-       $thing->broadcast($dxchan);
+sub add_user
+{
+       my $node = shift;
+       my $user = shift;
+       my $flag = shift;
+       
+       $node->add_user($user, $flag);
+       my $ur = upd_user_rec($user, $node);
+       $ur->put;
 }
 
-sub in_filter
+sub upd_user_rec
 {
-       my $thing = shift;
-       my $dxchan = shift;
+       my $call = shift;
+       my $parentcall = shift;
        
-       # global route filtering on INPUT
-       if ($dxchan->{inroutefilter}) {
-               my ($filter, $hops) = $dxchan->{inroutefilter}->it($thing->{routedata});
-               unless ($filter) {
-                       dbg("PCPROT: Rejected by input route filter") if isdbg('chanerr');
-                       return;
-               }
-       }
-       return 1;
+       # 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);
+       return $user;
 }
 
-sub out_filter
+#
+# 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 $thing = shift;
-       my $dxchan = shift;
+       my $pkg = shift;
+       my $thing = $pkg->SUPER::new(@_);
        
-       # global route filtering on INPUT
-       if ($dxchan->{routefilter}) {
-               my ($filter, $hops) = $dxchan->{routefilter}->it($thing->{routedata});
-               unless ($filter) {
-                       dbg("PCPROT: Rejected by output route filter") if isdbg('chanerr');
-                       return;
+       $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->{hops} = $hops if $hops;
-       } elsif ($dxchan->{isolate}) {
-               return;
        }
-       return 1;
+       $thing->{anodes} = \@nodes if @nodes;
+       $thing->{ausers} = \@users if @users;
+       return $thing;
 }
+
+
+
+
 1;