From: minima <minima>
Date: Thu, 24 Feb 2005 11:08:20 +0000 (+0000)
Subject: make oneself broadcast
X-Git-Tag: R_1_52~144
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=729acdaa4d7ee8905ce76f6ab0ef6cd543c3bc49;p=spider.git

make oneself broadcast
---

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index 5dec124c..475fdd05 100644
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -169,17 +169,25 @@ sub per_minute
 {
 	# send hello and cf packages periodically
 	foreach my $dxchan (DXChannel::get_all()) {
-		next if $dxchan == $main::me;
 		next if $dxchan->is_aranea;
 		if ($main::systime >= $dxchan->lasthello + $hello_interval) {
-			my $thing = Thingy::Hello->new(user => $dxchan->call, h => $dxchan->here);
+			my $thing = Thingy::Hello->new(h => $dxchan->here);
+			$thing->{user} = $dxchan->{call} unless $dxchan == $main::me;
+			if (my $v = $dxchan->{version}) {
+				if ($dxchan->is_spider) {
+					$thing->{sw} = 'DXSp';
+				}
+				$thing->{v} = $v;
+			}
+			$thing->{b} = $dxchan->{build} if $dxchan->{build};
 			$thing->broadcast($dxchan);
 			$dxchan->lasthello($main::systime);
 		}
 		if ($dxchan->is_node) {
 			if ($main::systime >= $dxchan->lastcf + $cf_interval) {
 				my $call = $dxchan->call;
-				my $thing = Thingy::Rt->new(user => $call);
+				my $thing = Thingy::Rt->new();
+				$thing->{user} = $call unless $dxchan == $main::me;
 				if (my $nref = Route::Node::get($call)) {
 					$thing->copy_pc16_data($nref);
 					$thing->broadcast($dxchan);
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index d09632e3..354d6f5d 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -920,8 +920,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) {