X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=90e7f47196d21f6aa06a22e7dc13be05a87ef777;hb=e1d5c2a325cb6b8674eab55c23f12445aae01f52;hp=e19688bb1bba53295effd70c1a34bcf5326c83b5;hpb=ba799b8ac9feef688cff478a4006399b6dfc183f;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index e19688bb..90e7f471 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1353,7 +1353,10 @@ sub _decode_pc92_call
 	my $is_node = $flag & 4;
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
-	return ($call, $is_node, $is_extnode, $here, $part[1], $part[2]);
+	my $ip	= $part[3];
+	$ip ||= $part[1] if $part[1] && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/);
+	$ip =~ s/,/:/g if $ip;
+	return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip);
 }
 
 # decode a pc92 call: flag call : version : build
@@ -1364,7 +1367,7 @@ sub _encode_pc92_call
 	# plain call or value
 	return $ref unless ref $ref;
 
-	my $ext = shift;
+	my $ext = shift || 0;
 	my $flag = 0;
 	my $call = $ref->call;
 	my $extra = '';
@@ -1373,14 +1376,17 @@ sub _encode_pc92_call
 		$flag |= 4;
 		my $dxchan = DXChannel::get($call);
 		$flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc9x};
-		if ($ext) {
-			if ($ref->version) {
-				my $version = $ref->version || 1.0;
-				$version =  $version * 100 + 5300 if $version < 50;
-				$extra .= ":" . $version;
-			}
+		if (($ext & 1) && $ref->version) {
+			my $version = $ref->version || 1.0;
+			$version =  $version * 100 + 5300 if $version < 50;
+			$extra .= ":" . $version;
 		}
 	}
+	if (($ext & 2) && $ref->ip) {
+		my $ip = $ref->ip;
+		$ip =~ s/:/,/g;
+		$extra .= ':' . $ip;
+	}
 	return "$flag$call$extra";
 }
 
@@ -1394,18 +1400,19 @@ sub _add_thingy
 	my $dxchan = shift;
 	my $hops = shift;
 
-	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
+	my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
 	my @rout;
 
 	if ($call) {
 		if ($is_node) {
 			dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
-			@rout = $parent->add($call, $version, Route::here($here));
+			@rout = $parent->add($call, $version, Route::here($here), $ip);
 			my $r = Route::Node::get($call);
 			$r->PC92C_dxchan($dxchan->call, $hops) if $r;
 		} else {
 			dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
-			@rout = $parent->add_user($call, Route::here($here));
+			@rout = $parent->add_user($call, Route::here($here), $ip);
+			$dxchan->tell_buddies('loginb', $call, $parent->call) if $dxchan;
 		}
 		if ($pc92_slug_changes && $parent == $main::routeroot) {
 			$things_add{$call} = Route::get($call);
@@ -1419,6 +1426,7 @@ sub _del_thingy
 {
 	my $parent = shift;
 	my $s = shift;
+	my $dxchan = shift;
 	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
 	my @rout;
 	if ($call) {
@@ -1428,9 +1436,12 @@ sub _del_thingy
 			dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
 			@rout = $ref->del($parent) if $ref;
 		} else {
-			$ref = Route::User::get($call);
 			dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
-			@rout = $parent->del_user($ref) if $ref;
+			$ref = Route::User::get($call);
+			if ($ref) {
+				$dxchan->tell_buddies('logoutb', $call, $parent->call) if $dxchan;
+				@rout = $parent->del_user($ref);
+			}
 		}
 		if ($pc92_slug_changes && $parent == $main::routeroot) {
 			$things_del{$call} = $ref unless exists $things_add{$call};
@@ -1755,12 +1766,13 @@ sub handle_92
 			push @radd, $add if $add;
 		}
 
-		# do a pass through removing any references to either locally connected nodes or mycall
+		# do a pass through removing any references to either mycall
 		my @nent;
 		for (@ent) {
+			my $dxc;
 			next unless $_ && @$_;
-			if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) {
-				dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr');
+			if ($_->[0] eq $main::mycall) {
+				dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr');
 				next;
 			}
 			push @nent, $_;
@@ -1772,7 +1784,7 @@ sub handle_92
 			}
 		} elsif ($sort eq 'D') {
 			for (@nent) {
-				push @rdel, _del_thingy($parent, $_);
+				push @rdel, _del_thingy($parent, $_, $self);
 			}
 		} elsif ($sort eq 'C') {
 			my (@nodes, @users);
@@ -1806,10 +1818,10 @@ sub handle_92
 			}
 			# del users here
 			foreach my $r (@$dnodes) {
-				push @rdel,_del_thingy($parent, [$r, 1]);
+				push @rdel,_del_thingy($parent, [$r, 1], $self);
 			}
 			foreach my $r (@$dusers) {
-				push @rdel,_del_thingy($parent, [$r, 0]);
+				push @rdel,_del_thingy($parent, [$r, 0], $self);
 			}
 
 			# remember this last PC92C for rebroadcast on demand
@@ -1854,7 +1866,7 @@ sub find_pc9x_routes
 	if ($ref->isa('Route::User')) {
 		my $dxchan = DXChannel::get($to);
 		push @parent, $to if $dxchan;
-		push @parent, @{$ref->parent};
+		push @parent, $ref->parents;
 	} else {
 		@parent = $to;
 	}