fix more errors in pc19 and pc21
[spider.git] / perl / Thingy / Rt.pm
index ab831de286a1dd43132812b2bec961e7d7b31f9a..71b7a43aba7cd28070aec45b4a375c7c8f9b20e3 100644 (file)
@@ -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,52 +21,40 @@ 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;
+       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->{pnodes}) {
+                       $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};
 }
 
 sub from_Aranea
 {
        my $thing = shift;
-       return unless $thing;
-       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};
+       $thing->{u} ||= '';
+       $thing->{n} ||= '';
+       $thing->{a} ||= '';
        return $thing;
 }
 
@@ -72,8 +63,8 @@ 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,198 @@ 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->{origin};
+       my $chan_call = $dxchan->{call};
+       
+       my @pc19;
+       my @pc21;
 
-       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;
-                       }
+       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);
        }
-       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;
+       # 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);
                        }
                }
        }
-       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;
+       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);
                }
        }
-       return 1;
-}
+       $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);
 
-sub out_filter
-{
-       my $thing = shift;
-       my $dxchan = shift;
+               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;
+               }
        
-       # 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->{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;
 }
+
+#
+# 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 = map {Route::User::get($_)} $uref->users;
+       $thing->{ausers} = \@u if @u;
+       return @u;
+}
+
+
+
 1;