make oneself broadcast

diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index 5dec124c42f708dcbd3ad75e31deec70f11d6afd..475fdd05d12f71c1527c9477fb6d2e1393549ad5 100644 (file)
--- 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 d09632e3a09400891c58d744a75e644df320d425..354d6f5d4407ddb3a2ecf93c87c7366854e5ef8e 100644 (file)
--- 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) {