X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=cc468cd54409a0e6cfb3b103aab3187d235baf2b;hb=c85cacb2bc438725ee83553226e944f9f605d3b7;hp=ac755b099d98c64450eb2a108aa59db057a0de4c;hpb=7e4216e6aa68e9f8631c50de2d1fe7c7c88391d2;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ac755b09..cc468cd5 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -214,7 +214,6 @@ sub init
 	my $user = DXUser->get($main::mycall);
 	die "User $main::mycall not setup or disappeared RTFM" unless $user;
 	
-	$myprot_version += $main::version*100;
 	$main::me = DXProt->new($main::mycall, 0, $user); 
 	$main::me->{here} = 1;
 	$main::me->{state} = "indifferent";
@@ -223,7 +222,7 @@ sub init
 	$main::me->{metric} = 0;
 	$main::me->{pingave} = 0;
 	$main::me->{registered} = 1;
-	$main::me->{version} = 5252 + $main::version;
+	$main::me->{version} = $myprot_version + int ($main::version * 100);
 	$main::me->{build} = $main::build;
 	$main::me->{lastcf} = $main::me->{lasthello} = time;
 }
@@ -1107,8 +1106,7 @@ sub handle_20
 	my $thing = Thingy::Rt->new(user=>$self->{call});
 	my $nref = Route::Node::get($self->{call});
 	$thing->copy_pc16_data($nref);
-	$thing->broadcast;
-	
+	$thing->broadcast($self);
 	$self->lastcf($main::systime);
 }
 		
@@ -1199,7 +1197,7 @@ sub handle_22
 	my $thing = Thingy::Rt->new(user=>$self->{call});
 	my $nref = Route::Node::get($self->{call});
 	$thing->copy_pc16_data($nref);
-	$thing->broadcast;
+	$thing->broadcast($self);
 	$self->lastcf($main::systime);
 }
 				
@@ -1547,9 +1545,8 @@ sub handle_51
 	}
 
 	my $thing = Thingy::Ping->new(origin=>$main::mycall);
-	$thing->from_DXProt($_[2] eq $self->{call} ? (user=>$_[2]) : (user=>$self->{call}, o=>$_[2]), group=>$_[1], out=>$_[3], DXProt=>$line);
-	$thing->process($self);
-	
+	$thing->from_DXProt($self, $line, @_);
+	$thing->handle($self);
 }
 
 # dunno but route it