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->add_auth;
+ $thing->{sw} ||= 'DXSp';
+ $thing->{v} ||= $main::version;
+ $thing->{b} ||= $main::build;
+ $thing->{h} ||= $main::me->here;
+ }
- $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};
}
my $thing = shift;
my $dxchan = shift;
+ my $origin = $thing->{origin};
+ my $node = $dxchan->{call};
+
my $nref;
+
$thing->{pc19n} ||= [];
# 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->{v}, $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);
+ $nref = Route::Node->new($origin, $v, 1);
push @{$thing->{pc19n}}, $nref;
+ $nref->np(1);
}
}
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::Hello::_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->{v}, $thing->{h});
+ 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});
+ $thing->{pc16u} = \@ref if @ref;
}
}
+ } else {
+ $nref->version($thing->{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}};