X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=7df2ce240e8bfe1045a1319610d3fab9c719fafd;hb=183573e742b5233e3b7ac6882770d16942a10542;hp=4e130f188c41cc6d570af7a5ef339093561b35a2;hpb=8eb1f5dcc25a223fa06c5e8b5bf7dbe97d42f6dd;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4e130f18..7df2ce24 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -534,7 +534,7 @@ sub normal
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
-			if ($dxchan ne $self) {
+			if ($dxchan && $dxchan ne $self) {
 				dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
 				return;
 			}
@@ -579,7 +579,7 @@ sub normal
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
-			if ($dxchan ne $self) {
+			if ($dxchan && $dxchan ne $self) {
 				dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
 				return;
 			}
@@ -1366,27 +1366,33 @@ sub send_local_config
 	my $self = shift;
 	my $n;
 	my @nodes;
-	my @localcalls;
-	my @remotecalls;
-		
+	my @localnodes;
+	my @remotenodes;
+
+	dbg('trace', 'DXProt::send_local_config');
+	
 	# send our nodes
 	if ($self->{isolate}) {
-		@localcalls = ( $main::mycall );
+		@localnodes = ( $main::routeroot );
 	} 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
-		my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} && !$_->{isolate} } DXChannel::get_all_nodes();
-		@localcalls = map { $_->{call} } @dxchan if @dxchan;
-		@remotecalls = map {my $r = Route::Node::get($_); $r ? $r->rnodes(@localcalls, $main::mycall, $self->{call}) : () } @localcalls if @localcalls;
-		unshift @localcalls, $main::mycall;
+		my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+		@localnodes = map { Route::Node::get($_->{call}) } @dxchan if @dxchan;
+		my @intcalls = map { $_->nodes } @localnodes if @localnodes;
+		my $ref = Route::Node::get($self->{call});
+		my @rnodes = $ref->nodes;
+		for my $n (@intcalls) {
+			push @remotenodes, Route::Node::get($n) unless grep $n eq $_, @rnodes;
+		}
+		unshift @localnodes, $main::routeroot;
 	}
-	@nodes = map {my $r = Route::Node::get($_); $r ? $r : ()} (@localcalls, @remotecalls);
 	
-	send_route($self, \&pc19, scalar @nodes, @nodes);
+	send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes);
 	
 	# get all the users connected on the above nodes and send them out
-	foreach $n (@nodes) {
+	foreach $n (@localnodes, @remotenodes) {
 		send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
 	}
 }