clean up various things and add the DXXml.pm module

[spider.git] / perl / Thingy / Hello.pm

diff --git a/perl/Thingy/Hello.pm b/perl/Thingy/Hello.pm
index 9c6a539f8255f39569574019bbbb504a28c906f0..7221d7898722fc58dd15a451b388211d5ada13fd 100644 (file)
--- a/perl/Thingy/Hello.pm
+++ b/perl/Thingy/Hello.pm
@@ -39,11 +39,11 @@ sub gen_Aranea
                if ($thing->{user}) {
                        $thing->{h} ||= $dxchan->here;
                } else {
-                       $thing->add_auth;
                        $thing->{sw} ||= 'DXSp';
-                       $thing->{v} ||= $main::version;
-                       $thing->{b} ||= $main::build;
+                       $thing->{v} ||= $main::me->version;
+                       $thing->{b} ||= $main::me->build;
                        $thing->{h} ||= $main::me->here;
+                       $thing->add_auth;
                }
                
                $thing->{Aranea} = Aranea::genmsg($thing, [qw(sw h v b s auth)]);
@@ -62,6 +62,14 @@ sub handle
        my $nref;
 
        $thing->{pc19n} ||= [];
+
+       my $v = $thing->{v};
+       if ($v) {
+               $v = $DXProt::myprot_version + int ($v*100) if $v > 2 && $v < 3;
+               $v = $DXProt::myprot_version + 150 unless $v >= 5400;
+               $v =~ s/\.\d+$//;
+               $thing->{pcv} = $v;
+       }
        
        # verify authenticity
        if ($node eq $origin) {
@@ -82,7 +90,7 @@ sub handle
                        }
                }
                if ($dxchan->{state} ne 'normal') {
-                       $nref = $main::routeroot->add($origin, $thing->{v}, $thing->{h});
+                       $nref = $main::routeroot->add($origin, $thing->{pcv}, $thing->{h});
                        push @{$thing->{pc19n}}, $nref if $nref;
                        $dxchan->start($dxchan->{conn}->{csort}, $dxchan->{conn}->{outbound} ? 'O' : 'A');
                        if ($dxchan->{outbound}) {
@@ -90,7 +98,7 @@ sub handle
                                $thing->send($dxchan);
 
                                # broadcast our configuration to the world
-                               $thing = Thingy::Rt->new_lcf;
+                               $thing = Thingy::Rt->new_cf;
                                $thing->broadcast;
                        }
                }
@@ -102,7 +110,7 @@ sub handle
                # note that we cannot do any connections at this point
                $nref = Route::Node::get($origin);
                unless ($nref) {
-                       my $v = $thing->{user} ? undef : $thing->{v};
+                       my $v = $thing->{user} ? undef : $thing->{pcv};
                        $nref = Route::Node->new($origin, $v, 1);
                        push @{$thing->{pc19n}}, $nref;
                        $nref->np(1);
@@ -114,19 +122,19 @@ sub handle
                my $ur = Route::get($user);
                unless ($ur) {
                        my @ref;
-                       my $uref = DXUser->get_current($user) || Thingy::Hello::_upd_user_rec($user, $origin)->put;
+                       my $uref = DXUser->get_current($user) || Thingy::Rt::_upd_user_rec($user, $origin)->put;
                        if ($uref->is_node || $uref->is_aranea) {
-                           push @ref, $nref->add($user, $thing->{v}, $thing->{h});
+                           push @ref, $nref->add($user, $thing->{pcv} || 0, $thing->{h} || 0);
                                push @{$thing->{pc19n}}, @ref if @ref;
                                do $_->np(1) for @ref;
                        } else {
                                $thing->{pc16n} = $nref;
-                               push @ref, $nref->add_user($user, $thing->{h});
+                               push @ref, $nref->add_user($user, $thing->{h} || 0);
                                $thing->{pc16u} = \@ref if @ref;
                        }
                }
        } else {
-               $nref->version($thing->{v}) unless $nref->version;
+               $nref->version($v) unless $nref->version;
                $nref->build($thing->{b}) unless $nref->build;
                $nref->sw($thing->{sw}) unless $nref->sw;
                $nref->here($thing->{h}) if exists $thing->{h};