X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=769aefe8c01525e2d576540deb150432459bbbbd;hb=a48eea32af123b571889f70a3e7cef8e157cf389;hp=c2627c9c09c1495d7ea610328437e0a69893ea68;hpb=776d7bb9277c9d24708e297f240395b51b0aaa93;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index c2627c9c..769aefe8 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -1,16 +1,16 @@
 #!/usr/bin/perl
 #
 # This module impliments the abstracted routing for all protocols and
-# is probably what I SHOULD have done the first time. 
+# is probably what I SHOULD have done the first time.
 #
 # Heyho.
 #
-# This is just a container class which I expect to subclass 
+# This is just a container class which I expect to subclass
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
-# 
+#
+#
 
 package Route;
 
@@ -35,7 +35,7 @@ use vars qw(%list %valid $filterdef);
 		 );
 
 $filterdef = bless ([
-			  # tag, sort, field, priv, special parser 
+			  # tag, sort, field, priv, special parser
 			  ['channel', 'c', 0],
 			  ['channel_dxcc', 'nc', 1],
 			  ['channel_itu', 'ni', 2],
@@ -67,8 +67,8 @@ sub new
 		Prefix::cty_data($call);
 
 	$self->{flags} = here(1);
-	
-	return $self; 
+
+	return $self;
 }
 
 #
@@ -85,7 +85,7 @@ sub _getcall
 	return $thingy;
 }
 
-# 
+#
 # add and delete a callsign to/from a list
 #
 
@@ -96,7 +96,7 @@ sub _addlist
 	my @out;
 	foreach my $c (@_) {
 		confess "Need a ref here" unless ref($c);
-		
+
 		my $call = $c->{call};
 		unless (grep $_ eq $call, @{$self->{$field}}) {
 			push @{$self->{$field}}, $call;
@@ -166,7 +166,7 @@ sub parents
 	return @{$self->{parent}};
 }
 
-# 
+#
 # display routines
 #
 
@@ -180,34 +180,37 @@ sub user_call
 sub config
 {
 	my $self = shift;
-	my $nodes_only = shift;
+	my $nodes_only = shift || 0;
+	my $width = shift || 79;
 	my $level = shift;
 	my $seen = shift;
 	my @out;
 	my $line;
-	my $call = $self->user_call;
+	my $call = $self->{call};
 	my $printit = 1;
 
+	dbg("config: $call nodes: $nodes_only level: $level calls: " . join(',', @_)) if isdbg('routec');
+
 	# allow ranges
 	if (@_) {
 		$printit = grep $call =~ m|$_|, @_;
 	}
 
 	if ($printit) {
-		my $pcall = $call;
-		$pcall .= ":" . $self->obscount if $self->via_pc92;
+		my $pcall = $self->user_call;
+		$pcall .= ":" . $self->obscount if isdbg('obscount');
+
+
+		$line = ' ' x ($level*2) . $pcall;
+		$pcall = ' ' x length $pcall;
 
-		
-		$line = ' ' x ($level*2) . "$pcall";
-		$call = ' ' x length $pcall; 
-		
 		# recursion detector
-		if ((DXChannel::get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+		if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
 			$line .= ' ...';
 			push @out, $line;
 			return @out;
 		}
-		push @$seen, $self->{call};
+		$seen->{$call}++;
 
 		# print users
 		unless ($nodes_only) {
@@ -221,12 +224,12 @@ sub config
 					} else {
 						$c = "$ucall?";
 					}
-					if ((length $line) + (length $c) + 1 < 79) {
+					if ((length $line) + (length $c) + 1 < $width) {
 						$line .= $c . ' ';
 					} else {
 						$line =~ s/\s+$//;
 						push @out, $line;
-						$line = ' ' x ($level*2) . "$call->$c ";
+						$line = ' ' x ($level*2) . "$pcall->$c ";
 					}
 				}
 			}
@@ -234,18 +237,28 @@ sub config
 		$line =~ s/->$//g;
 		$line =~ s/\s+$//;
 		push @out, $line if length $line;
+	} else {
+		# recursion detector
+		if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+			return @out;
+		}
+		$seen->{$call}++;
 	}
-	
+
 	# deal with more nodes
 	foreach my $ncall (sort @{$self->{nodes}}) {
 		my $nref = Route::Node::get($ncall);
 
 		if ($nref) {
 			my $c = $nref->user_call;
-#			dbg("recursing from $call -> $c") if isdbg('routec');
-			push @out, $nref->config($nodes_only, $level+1, $seen, @_);
+			dbg("recursing from $call -> $c") if isdbg('routec');
+			my @rout = $nref->config($nodes_only, $width, $level+1, $seen, @_);
+			if (@rout && @_) {
+				push @out, ' ' x ($level*2) . $self->user_call unless grep /^\s+$call/, @out;
+			}
+			push @out, @rout;
 		} else {
-			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); 
+			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
 		}
 	}
 
@@ -259,7 +272,7 @@ sub cluster
 	my $users = scalar DXCommandmode::get_all();
 	my $maxusers = Route::User::max();
 	my $uptime = main::uptime();
-	
+
 	return " $nodes nodes, $users local / $tot total users  Max users $maxusers  Uptime $uptime";
 }
 
@@ -273,59 +286,106 @@ sub get
 	return Route::Node::get($call) || Route::User::get($call);
 }
 
-# find all the possible dxchannels which this object might be on
-sub alldxchan
+sub findroutes
 {
-	my $self = shift;
-	my @dxchan;
-#	dbg("Trying node $self->{call}") if isdbg('routech');
-
-	my $dxchan = DXChannel::get($self->{call});
-	push @dxchan, $dxchan if $dxchan;
-	
-	# it isn't, build up a list of dxchannels and possible ping times 
-	# for all the candidates.
-	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;
+	my $call = shift;
+	my $level = shift || 0;
+	my $seen = shift || {};
+	my @out;
+
+	dbg("findroutes: $call level: $level calls: " . join(',', @_)) if isdbg('routec');
+
+	# recursion detector (no point in recursing that deeply)
+	return () if $seen->{$call};
+	if ($level >= 20) {
+		dbg("Route::findroutes: recursion limit reached looking for $call");
+		return ();
+	}
+
+	# return immediately if we are directly connected
+	if (my $dxchan = DXChannel::get($call)) {
+		$seen->{$call}++;
+		push @out, $level ? [$level, $dxchan] : $dxchan;
+		return @out;
+	}
+	$seen->{$call}++;
+
+	# deal with more nodes
+	my $nref = Route::get($call);
+	return () unless $nref;
+	foreach my $ncall (@{$nref->{parent}}) {
+		unless ($seen->{$ncall}) {
+
+			# put non-pc9x nodes to the back of the queue
+			my $l = $level + ($nref->{do_pc9x} && ($nref->{version}||5454) >= 5454 ? 0 : 30);
+			dbg("recursing from $call -> $ncall level $l") if isdbg('routec');
+			my @rout = findroutes($ncall, $l+1, $seen);
+			push @out, @rout;
+		}
+	}
+
+	if ($level == 0) {
+		my @nout = map {$_->[1]} sort {$a->[0] <=> $b->[0]} @out;
+		my $last;
+		if ($nref->isa('Route::Node')) {
+			my $ncall = $nref->PC92C_dxchan;
+			$last = DXChannel::get($ncall) if $ncall;
+		} else {
+			my $pcall = $nref->{parent}->[0];
+			my ($ref, $ncall);
+			$ref = Route::Node::get($pcall) if $pcall;
+			$ncall = $ref->PC92C_dxchan if $ref;
+			$last = DXChannel::get($ncall) if $ncall;
+		}
+
+		if (isdbg('findroutes')) {
+			if (@out) {
+				foreach (sort {$a->[0] <=> $b->[0]} @out) {
+					dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
+				}
 			} 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("ROUTE: findroute $call -> PC92C_dxchan " . $last->call) if $last;
 			}
 		}
+		push @nout, $last if @out == 0 && $last;
+		return @nout;
+	} else {
+		return @out;
 	}
-#	dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) );
+}
+
+# find all the possible dxchannels which this object might be on
+sub alldxchan
+{
+	my $self = shift;
+	my @dxchan = findroutes($self->{call});
 	return @dxchan;
 }
 
 sub dxchan
 {
 	my $self = shift;
-	
+
 	# ALWAYS return the locally connected channel if present;
 	my $dxchan = DXChannel::get($self->call);
 	return $dxchan if $dxchan;
-	
+
 	my @dxchan = $self->alldxchan;
 	return undef unless @dxchan;
-	
+
 	# determine the minimum ping channel
-	my $minping = 99999999;
-	foreach my $dxc (@dxchan) {
-		my $p = $dxc->pingave;
-		if (defined $p  && $p < $minping) {
-			$minping = $p;
-			$dxchan = $dxc;
-		}
-	}
-	$dxchan = shift @dxchan unless $dxchan;
-	return $dxchan;
+#	my $minping = 99999999;
+#	foreach my $dxc (@dxchan) {
+#		my $p = $dxc->pingave;
+#		if (defined $p  && $p < $minping) {
+#			$minping = $p;
+#			$dxchan = $dxc;
+#		}
+#	}
+#	$dxchan = shift @dxchan unless $dxchan;
+
+	# dxchannels are now returned in order of "closeness"
+	return $dxchan[0];
 }
 
 
@@ -338,14 +398,14 @@ sub DESTROY
 {
 	my $self = shift;
 	my $pkg = ref $self;
-	
+
 	dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
 }
 
 no strict;
 #
-# return a list of valid elements 
-# 
+# return a list of valid elements
+#
 
 sub fields
 {
@@ -362,7 +422,7 @@ sub fields
 #
 
 sub field_prompt
-{ 
+{
 	my ($self, $ele) = @_;
 	my $pkg = ref $self;
     my $val = "${pkg}::valid";
@@ -378,7 +438,7 @@ sub AUTOLOAD
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
 	$name =~ s/^.*:://o;
-  
+
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
 
 	# this clever line of code creates a subroutine which takes over from autoload