{
my $self = shift;
my $nodes_only = shift || 0;
+ my $width = shift || 79;
my $level = shift;
my $seen = shift;
my @out;
} else {
$c = "$ucall?";
}
- if ((length $line) + (length $c) + 1 < 79) {
+ if ((length $line) + (length $c) + 1 < $width) {
$line .= $c . ' ';
} else {
$line =~ s/\s+$//;
if ($nref) {
my $c = $nref->user_call;
dbg("recursing from $call -> $c") if isdbg('routec');
- my @rout = $nref->config($nodes_only, $level+1, $seen, @_);
+ 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;
}
return Route::Node::get($call) || Route::User::get($call);
}
+# this may be a better algorithm
+#start = {start node}
+#end = {end node}
+#dist = 0
+#marked(n) = false for all nodes n
+#queue = [start]
+#while queue is not empty:
+# dist = dist + 1
+# newqueue = []
+# for each node n in queue:
+# for each edge from node n to node m:
+# if not marked(m):
+# marked(m) = true
+# if m == end:
+# -- We've found the end node
+# -- it's a distance "dist" from the start
+# return dist
+# add m to newqueue
+# queue = newqueue
+
sub findroutes
{
my $call = shift;
dbg("findroutes: $call level: $level calls: " . join(',', @_)) if isdbg('routec');
- # recursion detector
+ # 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)) {
unless ($seen->{$ncall}) {
# put non-pc9x nodes to the back of the queue
- my $l = $level + ($nref->{do_pc9x} ? 0 : 30);
+ 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;