improve debugging of obscounting
[spider.git] / perl / DXProt.pm
index ccf912910559209e5d567a377042f205dcd5c704..835d4424f7a2dbcf80607651bbf0a0d72e6f5c21 100644 (file)
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXProt;
@@ -771,9 +771,11 @@ sub send_local_config
        my @remotenodes;
 
        if ($self->{isolate}) {
+               dbg("send_local_config: isolated");
                @localnodes = ( $main::routeroot );
                $self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
        } elsif ($self->{do_pc9x}) {
+               dbg("send_local_config: doing pc9x");
                my $node = Route::Node::get($self->{call});
                $self->send_last_pc92_config($main::routeroot);
                $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
@@ -782,6 +784,8 @@ sub send_local_config
                # and are not themselves isolated, this to make sure that isolated nodes
                # don't appear outside of this node
 
+               dbg("send_local_config: traditional");
+
                # send locally connected nodes
                my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
                @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
@@ -833,46 +837,10 @@ sub gen_my_pc92_config
 sub gen_pc92_update
 {
        my $self = shift;
-       my $with_pc92_nodes = shift;
-       my $node;
-       my @lines;
-       my @dxchan;
-       my @localnodes;
-
-       dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
 
        # send 'my' configuration for all channels
-       push @lines, gen_my_pc92_config($main::routeroot);
-
-#      if ($with_pc92_nodes) {
-               # send out the configuration of all the directly connected PC92 nodes with current configuration
-               # but with the dates that the last config came in with.
-#              @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
-#              dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-#              @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-#              dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-#              foreach $node (@localnodes) {
-#                      if ($node && $node->lastid->{92}) {
-#                              my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
-#                              push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
-#                      }
-#              }
-#      }
-
-       # send the configuration of all the directly connected 'external' nodes that don't handle PC92
-       # out with the 'external' marker on the first node.
-#      @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
-#      dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-#      @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-#      dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-#      foreach $node (@localnodes) {
-#              if ($node) {
-#                      push @lines, gen_my_pc92_config($node);
-#              }
-#      }
-
-       dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
-       return @lines;
+       my $l = gen_my_pc92_config($main::routeroot);
+       return $l;
 }
 
 
@@ -900,6 +868,7 @@ sub send_pc92_config
 
 sub send_pc92_update
 {
+       my $self = shift;
        my $call = shift;
 
        dbg('DXProt::send_pc92_update') if isdbg('trace');
@@ -916,19 +885,19 @@ sub time_out_pc92_routes
                my $o = $n->dec_obs;
                if ($o <= 0) {
                        if (my $dxchan = DXChannel::get($n->call)) {
-                               dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+                               dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
                                $dxchan->disconnect;
                                next;
                        }
                        my @parents = map {Route::Node::get($_)} $n->parents;
                        for (@parents) {
                                if ($_) {
-                                       dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+                                       dbg("deleting pc92 $_->{call} from $n->{call} on obscount")  if isdbg('obscount');
                                        push @rdel, $n->del($_);
                                }
                        }
                } else {
-                       dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+                       dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('obscount');
                }
        }
        for (@rdel) {
@@ -1254,6 +1223,7 @@ sub send_route
        }
 }
 
+# broadcast everywhere
 sub broadcast_route
 {
        my $self = shift;
@@ -1269,8 +1239,33 @@ sub broadcast_route
        }
        unless ($self->{isolate}) {
                foreach $dxchan (@dxchan) {
-                       next if $dxchan == $self;
-                       next if $dxchan == $main::me;
+                       next if $dxchan == $self || $dxchan == $main::me;
+                       next if $origin eq $dxchan->{call};     # don't route some from this call back again.
+                       next unless $dxchan->isa('DXProt');
+
+                       $dxchan->send_route($origin, $generate, @_);
+               }
+       }
+}
+
+# broadcast to non-pc9x nodes
+sub broadcast_route_nopc9x
+{
+       my $self = shift;
+       my $origin = shift;
+       my $generate = shift;
+       my $line = shift;
+       my @dxchan = DXChannel::get_all_nodes();
+       my $dxchan;
+
+       if ($line) {
+               $line =~ /\^H(\d+)\^?\~?$/;
+               return unless $1 > 0;
+       }
+       unless ($self->{isolate}) {
+               foreach $dxchan (@dxchan) {
+                       next if $dxchan == $self || $dxchan == $main::me;
+                       next if $origin eq $dxchan->{call};     # don't route some from this call back again.
                        next unless $dxchan->isa('DXProt');
                        next if $dxchan->{do_pc9x};
                        next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
@@ -1296,6 +1291,7 @@ sub send_route_pc92
        $self->send($line);
 }
 
+# broadcast only to pc9x nodes
 sub broadcast_route_pc9x
 {
        my $self = shift;
@@ -1315,8 +1311,8 @@ sub broadcast_route_pc9x
                foreach $dxchan (@dxchan) {
                        next if $dxchan == $self || $dxchan == $main::me;
                        next if $origin eq $dxchan->{call};     # don't route some from this call back again.
-                       next unless $dxchan->{do_pc9x};
                        next unless $dxchan->isa('DXProt');
+                       next unless $dxchan->{do_pc9x};
 
                        $dxchan->send($line);
                }
@@ -1329,7 +1325,7 @@ sub route_pc16
        return unless $self->user->wantpc16;
        my $origin = shift;
        my $line = shift;
-       broadcast_route($self, $origin, \&pc16, $line, 1, @_);
+       broadcast_route_nopc9x($self, $origin, \&pc16, $line, 1, @_);
 }
 
 sub route_pc17
@@ -1338,7 +1334,7 @@ sub route_pc17
        return unless $self->user->wantpc16;
        my $origin = shift;
        my $line = shift;
-       broadcast_route($self, $origin, \&pc17, $line, 1, @_);
+       broadcast_route_nopc9x($self, $origin, \&pc17, $line, 1, @_);
 }
 
 sub route_pc19
@@ -1346,7 +1342,7 @@ sub route_pc19
        my $self = shift;
        my $origin = shift;
        my $line = shift;
-       broadcast_route($self, $origin, \&pc19, $line, scalar @_, @_);
+       broadcast_route_nopc9x($self, $origin, \&pc19, $line, scalar @_, @_);
 }
 
 sub route_pc21
@@ -1354,7 +1350,7 @@ sub route_pc21
        my $self = shift;
        my $origin = shift;
        my $line = shift;
-       broadcast_route($self, $origin, \&pc21, $line, scalar @_, @_);
+       broadcast_route_nopc9x($self, $origin, \&pc21, $line, scalar @_, @_);
 }
 
 sub route_pc24