make sure a fractional version is not propagated on

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

diff --git a/perl/Thingy/Hello.pm b/perl/Thingy/Hello.pm
index 5b63900699b7ad05d40806f30e1af76d8df12ab6..7221d7898722fc58dd15a451b388211d5ada13fd 100644 (file)
--- a/perl/Thingy/Hello.pm
+++ b/perl/Thingy/Hello.pm
@@ -33,14 +33,20 @@ $verify_on_login = 1;                       # make sure that a HELLO coming from
 sub gen_Aranea
 {
        my $thing = shift;
+       my $dxchan = shift;
+       
        unless ($thing->{Aranea}) {
-               $thing->add_auth;
-
-               $thing->{sw} ||= 'DXSp';
-               $thing->{v} ||= $main::version;
-               $thing->{b} ||= $main::build;
+               if ($thing->{user}) {
+                       $thing->{h} ||= $dxchan->here;
+               } else {
+                       $thing->{sw} ||= 'DXSp';
+                       $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 v b s auth)]);
+               $thing->{Aranea} = Aranea::genmsg($thing, [qw(sw h v b s auth)]);
        }
        return $thing->{Aranea};
 }
@@ -50,50 +56,64 @@ sub handle
        my $thing = shift;
        my $dxchan = shift;
        
+       my $origin = $thing->{origin};
+       my $node = $dxchan->{call};
+       
        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 ($dxchan->{call} eq $thing->{origin}) {
+       if ($node eq $origin) {
 
                # for directly connected calls
-               if ($verify_on_login) {
+               if ($verify_on_login && !$thing->{user}) {
                        my $pp = $dxchan->user->passphrase;
                        unless ($pp) {
-                               dbglog('err', "Thingy::Hello::handle: verify on and $thing->{origin} has no passphrase");
+                               dbglog('err', "Thingy::Hello::handle: verify on and $origin has no passphrase");
                                $dxchan->disconnect;
                                return;
                        }
-                       my $auth = Verify->new("DXSp,$thing->{origin},$thing->{s},$thing->{v},$thing->{b}");
+                       my $auth = Verify->new("DXSp,$origin,$thing->{s},$thing->{v},$thing->{b}");
                        unless ($auth->verify($thing->{auth}, $dxchan->user->passphrase)) {
-                               dbglog('err', "Thingy::Hello::handle: verify on and $thing->{origin} failed auth check");
+                               dbglog('err', "Thingy::Hello::handle: verify on and $origin failed auth check");
                                $dxchan->disconnect;
                                return;
                        }
                }
                if ($dxchan->{state} ne 'normal') {
+                       $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}) {
                                my $thing = Thingy::Hello->new();
                                $thing->send($dxchan);
 
                                # broadcast our configuration to the world
-                               $thing = Thingy::Rt->new_lcf;
+                               $thing = Thingy::Rt->new_cf;
                                $thing->broadcast;
                        }
                }
-               my $origin = $thing->{origin};
-               $nref = $main::routeroot->add($origin, $thing->{v}, 1);
-               push @{$thing->{pc19n}}, $nref if $nref;
+               $nref = Route::Node::get($origin);
+               $nref->np(1);
        } else {
                
                # for otherwise connected calls, that come in relayed from other nodes
                # note that we cannot do any connections at this point
-               $nref = Route::Node::get($thing->{origin});
+               $nref = Route::Node::get($origin);
                unless ($nref) {
-                       my $v = $thing->{user} ? undef : $thing->{v};
-                       $nref = Route::Node->new($thing->{origin}, $v, 1);
+                       my $v = $thing->{user} ? undef : $thing->{pcv};
+                       $nref = Route::Node->new($origin, $v, 1);
                        push @{$thing->{pc19n}}, $nref;
+                       $nref->np(1);
                }
        }
 
@@ -101,18 +121,27 @@ sub handle
        if (my $user = $thing->{user}) {
                my $ur = Route::get($user);
                unless ($ur) {
-                       my $uref = DXUser->get_current($user);
+                       my @ref;
+                       my $uref = DXUser->get_current($user) || Thingy::Rt::_upd_user_rec($user, $origin)->put;
                        if ($uref->is_node || $uref->is_aranea) {
-                               my $u = $nref->add($user, $thing->{v}, 1);
-                               push @{$thing->{pc19n}}, $u if $u;
+                           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;
-                               $thing->{pc16u} = [$nref->add_user($user, 1)];
+                               push @ref, $nref->add_user($user, $thing->{h} || 0);
+                               $thing->{pc16u} = \@ref if @ref;
                        }
                }
+       } else {
+               $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};
        }
-       RouteDB::update($thing->{origin}, $dxchan->{call}, $thing->{hopsaway});
-       RouteDB::update($thing->{user}, $dxchan->{call}, $thing->{hopsaway}) if $thing->{user};
+
+       RouteDB::update($origin, $node, $thing->{hopsaway});
+       RouteDB::update($thing->{user}, $node, $thing->{hopsaway}) if $thing->{user};
        
        delete $thing->{pc19n} unless @{$thing->{pc19n}};