From 05bed9a172a48255aff58f64ab01df58a4d87891 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Sun, 24 Jun 2007 01:03:03 +0100
Subject: [PATCH] make Route::findroutes the basis of all routing

---
 perl/DXProtHandle.pm |  8 +++++---
 perl/Route.pm        | 47 ++++++++++++--------------------------------
 perl/Version.pm      |  2 +-
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index d4ef2c1d..d55e15e3 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1744,14 +1744,16 @@ sub handle_93
 		# convert to PC10 talks where appropriate
 		my $ref = Route::get($to);
 		if ($ref) {
-			my @dxchan = $ref->alldxchan;
-			for $dxchan (@dxchan) {
+			# just go for the "best" one for now (rather than broadcast)
+			$dxchan = $ref->dxchan;
+#			my @dxchan = $ref->alldxchan;
+#			for $dxchan (@dxchan) {
 				if ($dxchan->{do_pc9x}) {
 					$dxchan->send($line);
 				} else {
 					$dxchan->talk($from, $to, $via, $text, $onode);
 				}
-			}
+#			}
 			return;
 		}
 
diff --git a/perl/Route.pm b/perl/Route.pm
index 860c5235..72bb5db4 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -320,30 +320,7 @@ sub findroutes
 sub alldxchan
 {
 	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;
-			} 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)) );
+	my @dxchan = findroutes($self->{call});
 	return @dxchan;
 }
 
@@ -359,16 +336,18 @@ sub dxchan
 	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];
 }
 
 
diff --git a/perl/Version.pm b/perl/Version.pm
index 2c592a72..929da470 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '79';
+$build = '80';
 
 1;
-- 
2.34.1