X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=1d28e4024ced3cc3a71554ccd7f33aa08477b90d;hb=9311d6940faf0e9952d6d65d9ead572b06a52434;hp=d09632e3a09400891c58d744a75e644df320d425;hpb=de7f7dbbadcad48ba245f22db044b14954e18782;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index d09632e3..1d28e402 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -225,6 +225,7 @@ sub init
 	$main::me->{registered} = 1;
 	$main::me->{version} = 5252 + $main::version;
 	$main::me->{build} = $main::build;
+	$main::me->{lastcf} = $main::me->{lasthello} = time;
 }
 
 #
@@ -238,7 +239,7 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
-	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
+	$main::routeroot->add($call, '5000', 1) if $call ne $main::mycall;
 	return $self;
 }
 
@@ -810,7 +811,7 @@ sub handle_16
 		}
 		
 		$r = Route::User::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
+		my $flags = $here;
 		
 		if ($r) {
 			my $au = $r->addparent($parent);					
@@ -920,8 +921,8 @@ sub handle_18
 
 	# record the type and version offered
 	if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
-		$self->version(52.51 + $1);
-		$self->user->version(52.51 + $1);
+		$self->version(0 + $1);
+		$self->user->version(0 + $1);
 		$self->build(0 + $2);
 		$self->user->build(0 + $2);
 		unless ($self->is_spider) {
@@ -969,7 +970,7 @@ sub handle_19
 	if ($origin ne $self->call) {
 		my $op = Route::Node::get($origin);
 		unless ($op) {
-			$op = $parent->add($origin, 5000, Route::here(1));
+			$op = $parent->add($origin, 5000, 1);
 			my $user = DXUser->get_current($origin);
 			if (!$user) {
 				$user = DXUser->new($origin);
@@ -1043,7 +1044,7 @@ sub handle_19
 		}
 
 		my $r = Route::Node::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
+		my $flags = $here;
 
 		# is he under the control of the new protocol?
 		if ($r && $r->np) {
@@ -1061,11 +1062,6 @@ sub handle_19
 					next;
 				}
 			}
-			if ($r->version ne $ver || $r->flags != $flags) {
-				$r->version($ver);
-				$r->flags($flags);
-				push @rout, $r unless $ar;
-			}
 		} else {
 
 			# if he is directly connected or allowed then add him, otherwise store him up for later