From: djk <djk>
Date: Fri, 30 Apr 1999 16:19:37 +0000 (+0000)
Subject: changed order of nodes going out for AK1A's benefit
X-Git-Tag: R_1_26~2
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4ed8f51684c6f2183ffd5e46f1fc69dc4f52ebd9;p=spider.git

changed order of nodes going out for AK1A's benefit
---

diff --git a/Changes b/Changes
index 38d12170..874245f6 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+30Apr99=======================================================================
+1. Try to make it even more AK1A friendly by putting the node list out in the
+'correct' order.
 26Apr99=======================================================================
 1. added set/user command as a hack, please use this with care, there is
 very little checking.
diff --git a/filter/spots/K1XX.pl.issue b/filter/spots/K1XX.pl.issue
index cbcdd573..1e7feaa0 100644
--- a/filter/spots/K1XX.pl.issue
+++ b/filter/spots/K1XX.pl.issue
@@ -42,6 +42,6 @@
 
 $in = [
 	   [ 1, 5, 'n', [ 226 ], 15 ],         # dxcc country 226 is the US
-	   [ 1, 6, 'a', [ 226 ], 15 ],
+	   [ 1, 6, 'n', [ 226 ], 15 ],
        [ 0, 0, 'd' ],                  # default action (don't forward)
 ];
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index a6982f1f..fbc63bc0 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -717,27 +717,32 @@ sub send_local_config
 	my $self = shift;
 	my $n;
 	my @nodes;
-	
+	my @localnodes;
+	my @remotenodes;
+		
 	# send our nodes
 	if ($self->{isolate}) {
-		@nodes = (DXCluster->get_exact($main::mycall));
+		@localnodes = (DXCluster->get_exact($main::mycall));
 	} else {
 		# create a list of all the nodes that are not connected to this connection
 		# and are not themselves isolated, this to make sure that isolated nodes
         # don't appear outside of this node
-		@nodes = DXNode::get_all(); 
+		@nodes = DXNode::get_all();
 		@nodes = grep { $_->dxchan != $self } @nodes;
-		@nodes = grep { !($_->dxchan && $_->dxchan->isolate) } @nodes;
+		@nodes = grep { $_->{call} ne $main::mycall } @nodes;
+		@localnodes = grep { $_->dxchan->{call} eq $_->{call} && !$_->dxchan->{isolate} } @nodes if @nodes;
+		unshift @localnodes, DXCluster->get_exact($main::mycall);
+		@remotenodes = grep { $_->dxchan->{call} ne $_->{call} } @nodes if @nodes;
 	}
 
-	my @s = $me->pc19(@nodes);
+	my @s = $me->pc19(@localnodes, @remotenodes);
 	for (@s) {
 		my $routeit = adjust_hops($self, $_);
 		$self->send($routeit) if $routeit;
 	}
 	
 	# get all the users connected on the above nodes and send them out
-	foreach $n (@nodes) {
+	foreach $n (@localnodes, @remotenodes) {
 		my @users = values %{$n->list};
 		my @s = pc16($n, @users);
 		for (@s) {
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4a4400a1..88131b21 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -67,7 +67,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.25";				# the version no of the software
+$version = "1.26";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name