X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=eb83af11f8e16d6c1cb55e7e6429ddf6905911af;hb=ba799b8ac9feef688cff478a4006399b6dfc183f;hp=868317a9646234b9093a2598048a3a795f71e8d3;hpb=eef5dcbb47966521543e82dbb0b9269ec245d3d8;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 868317a9..eb83af11 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#
 #
 # This module impliments the abstracted routing for all protocols and
 # is probably what I SHOULD have done the first time.
@@ -289,65 +289,62 @@ sub get
 sub findroutes
 {
 	my $call = shift;
-	my $level = shift || 0;
-	my $seen = shift || {};
+	my %cand;
 	my @out;
 
-	dbg("findroutes: $call level: $level calls: " . join(',', @_)) if isdbg('routec');
+	dbg("ROUTE: findroutes $call") if isdbg('findroutes');
 
-	# recursion detector
-	return () if $seen->{$call};
+	my $nref = Route::get($call);
+	return () unless $nref;
 
-	# return immediately if we are directly connected
-	if (my $dxchan = DXChannel::get($call)) {
-		$seen->{$call}++;
-		push @out, $level ? [$level, $dxchan] : $dxchan;
-		return @out;
+	# we are directly connected, force "best possible" priority, but
+	# carry on in case user is connected on other nodes.
+	my $dxchan = DXChannel::get($call);
+	if ($dxchan) {
+		dbg("ROUTE: findroutes $call -> directly connected") if isdbg('findroutes');
+		$cand{$call} = 99;
 	}
-	$seen->{$call}++;
 
-	# deal with more nodes
-	my $nref = Route::get($call);
-	return () unless $nref;
-	foreach my $ncall (@{$nref->{parent}}) {
-		unless ($seen->{$ncall}) {
+	# obtain the dxchannels that have seen this thingy
+	my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
+	foreach my $p (@parent) {
+		next if $p eq $main::mycall; # this is dealt with above
+
+		# deal with directly connected nodes, again "best priority"
+		$dxchan = DXChannel::get($p);
+		if ($dxchan) {
+			dbg("ROUTE: findroutes $call -> connected direct via parent $p") if isdbg('findroutes');
+			$cand{$p} = 99;
+			next;
+		}
 
-			# 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;
+		my $r = Route::Node::get($p);
+		if ($r) {
+			my %r = $r->PC92C_dxchan;
+			while (my ($k, $v) = each %r) {
+				$cand{$k} = $v if $v > ($cand{$k} || 0);
+			}
 		}
 	}
 
-	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;
+	# remove any dxchannels that have gone away
+	while (my ($k, $v) = each %cand) {
+		if (my $dxc = DXChannel::get($k)) {
+			push @out, [$v, $dxc];
 		}
+	}
 
-		if (isdbg('findroutes')) {
-			if (@out) {
-				foreach (sort {$a->[0] <=> $b->[0]} @out) {
-					dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
-				}
-			} else {
-				dbg("ROUTE: findroute $call -> PC92C_dxchan " . $last->call) if $last;
+	# get a sorted list of dxchannels with the highest hop count first
+	my @nout = sort {$b->[0] <=> $a->[0]} @out;
+	if (isdbg('findroutes')) {
+		if (@nout) {
+			for (@nout) {
+				dbg("ROUTE: findroutes $call -> $_->[0] " . $_->[1]->call);
 			}
 		}
-		push @nout, $last if @out == 0 && $last;
-		return @nout;
-	} else {
-		return @out;
 	}
+
+	return @nout;
 }
 
 # find all the possible dxchannels which this object might be on
@@ -355,7 +352,7 @@ sub alldxchan
 {
 	my $self = shift;
 	my @dxchan = findroutes($self->{call});
-	return @dxchan;
+	return map {$_->[1]} @dxchan;
 }
 
 sub dxchan
@@ -369,21 +366,14 @@ sub 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;
-
 	# dxchannels are now returned in order of "closeness"
 	return $dxchan[0];
 }
 
+sub delete_interface
+{
+
+}
 
 
 #