X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=61d07249917a889028eba36f8f9c694e8ad9a0ab;hb=101516b420ac77cd9eb8294651104e43f3461c06;hp=f406a98a619bf2460abb532a97d088b8320b1d0d;hpb=febdc9bd8f6cd065d217ba089fab4361e9980f35;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index f406a98a..61d07249 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -49,7 +49,7 @@ sub new
 	$pkg = ref $pkg if ref $pkg;
 
 	my $self = bless {call => $call}, $pkg;
-	dbg('routelow', "create $pkg with $call");
+	dbg("create $pkg with $call") if isdbg('routelow');
 
 	# add in all the dxcc, itu, zone info
 	my @dxcc = Prefix::extract($call);
@@ -58,6 +58,7 @@ sub new
 		$self->{itu} = $dxcc[1]->itu;
 		$self->{cq} = $dxcc[1]->cq;						
 	}
+	$self->{flags} = here(1);
 	
 	return $self; 
 }
@@ -88,7 +89,7 @@ sub _addlist
 		my $call = _getcall($c);
 		unless (grep {$_ eq $call} @{$self->{$field}}) {
 			push @{$self->{$field}}, $call;
-			dbg('routelow', ref($self) . " adding $call to " . $self->{call} . "->\{$field\}");
+			dbg(ref($self) . " adding $call to " . $self->{call} . "->\{$field\}") if isdbg('routelow');
 		}
 	}
 	return $self->{$field};
@@ -102,7 +103,7 @@ sub _dellist
 		my $call = _getcall($c);
 		if (grep {$_ eq $call} @{$self->{$field}}) {
 			$self->{$field} = [ grep {$_ ne $call} @{$self->{$field}} ];
-			dbg('routelow', ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}");
+			dbg(ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}") if isdbg('routelow');
 		}
 	}
 	return $self->{$field};
@@ -111,14 +112,20 @@ sub _dellist
 #
 # flag field constructors/enquirers
 #
+# These can be called in various ways:-
+#
+# Route::here or $ref->here returns 1 or 0 depending on value of the here flag
+# Route::here(1) returns 2 (the bit value of the here flag)
+# $ref->here(1) or $ref->here(0) sets the here flag
+#
 
 sub here
 {
 	my $self = shift;
 	my $r = shift;
 	return $self ? 2 : 0 unless ref $self;
-	return ($self->{flags} & 2) ? 1 : 0 unless $r;
-	$self->{flags} = (($self->{flags} & ~2) | ($r ? 1 : 0));
+	return ($self->{flags} & 2) ? 1 : 0 unless defined $r;
+	$self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
 	return $r ? 1 : 0;
 }
 
@@ -127,7 +134,7 @@ sub conf
 	my $self = shift;
 	my $r = shift;
 	return $self ? 1 : 0 unless ref $self;
-	return ($self->{flags} & 1) ? 1 : 0 unless $r;
+	return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
 	$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
 	return $r ? 1 : 0;
 }
@@ -154,6 +161,7 @@ sub config
 	my $self = shift;
 	my $nodes_only = shift;
 	my $level = shift;
+	my $seen = shift;
 	my @out;
 	my $line;
 	my $call = $self->user_call;
@@ -167,6 +175,16 @@ sub config
 	if ($printit) {
 		$line = ' ' x ($level*2) . "$call";
 		$call = ' ' x length $call; 
+		
+		# recursion detector
+		if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+			$line .= ' ...';
+			push @out, $line;
+			return @out;
+		}
+		push @$seen, $self->{call};
+
+		# print users
 		unless ($nodes_only) {
 			if (@{$self->{users}}) {
 				$line .= '->';
@@ -193,12 +211,14 @@ sub config
 		push @out, $line if length $line;
 	}
 	
+	# deal with more nodes
 	foreach my $ncall (sort @{$self->{nodes}}) {
 		my $nref = Route::Node::get($ncall);
 
 		if ($nref) {
 			my $c = $nref->user_call;
-			push @out, $nref->config($nodes_only, $level+1, @_);
+#			dbg("recursing from $call -> $c") if isdbg('routec');
+			push @out, $nref->config($nodes_only, $level+1, $seen, @_);
 		} else {
 			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); 
 		}
@@ -232,31 +252,41 @@ sub get
 sub alldxchan
 {
 	my $self = shift;
-
+	my @dxchan;
+#	dbg("Trying node $self->{call}") if isdbg('routech');
 	my $dxchan = DXChannel->get($self->{call});
-	if ($dxchan) {
-		return (grep $dxchan == $_, @_) ? () : ($dxchan);
-	}
+	push @dxchan, $dxchan if $dxchan;
 	
 	# it isn't, build up a list of dxchannels and possible ping times 
 	# for all the candidates.
-	my @dxchan = @_;
-	foreach my $p (@{$self->{parent}}) {
-		my $ref = $self->get($p);
-		push @dxchan, $ref->alldxchan(@dxchan);
+	unless (@dxchan) {
+		foreach my $p (@{$self->{parent}}) {
+#			dbg("Trying parent $p") if isdbg('routech');
+			next if $p eq $main::mycall; # the root
+			my $dxchan = DXChannel->get($p);
+			if ($dxchan) {
+				push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
+			} else {
+				next if grep $p eq $_, @_;
+				my $ref = Route::Node::get($p);
+#				dbg("Next node $p " . ($ref ? 'Found' : 'NOT Found') if isdbg('routech') );
+				push @dxchan, $ref->alldxchan($self->{call}, @_) if $ref;
+			}
+		}
 	}
+#	dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) );
 	return @dxchan;
 }
 
 sub dxchan
 {
 	my $self = shift;
-	my $dxchan;
 	my @dxchan = $self->alldxchan;
 	return undef unless @dxchan;
 	
 	# determine the minimum ping channel
 	my $minping = 99999999;
+	my $dxchan;
 	foreach my $dxc (@dxchan) {
 		my $p = $dxc->pingave;
 		if (defined $p  && $p < $minping) {
@@ -277,7 +307,7 @@ sub DESTROY
 	my $self = shift;
 	my $pkg = ref $self;
 	
-	dbg('routelow', "$pkg $self->{call} destroyed");
+	dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
 }
 
 no strict;