{
my $thing = shift;
my $dxchan = shift;
- my $origin = $thing->{user} || $thing->{origin};
+ my $origin = $thing->{origin};
my $chan_call = $dxchan->{call};
+ my @pc19;
+ my @pc21;
+
my $parent = Route::Node::get($origin);
unless ($parent) {
- dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr');
- return;
+ dbg("Thingy::Rt::cf: new (unconnected) node $origin arrived") if isdbg('chanerr');
+ $parent = Route::Node::new($origin, 0, 1);
+ push @pc19, $parent;
+ }
+ $parent->np(1);
+
+ # move the origin over to the user, if required
+ if ($thing->{user}) {
+ $origin = $thing->{user};
+ my $ref = Route::Node::get($origin);
+ if ($ref) {
+ $parent = $ref;
+ } else {
+ # auto vivify a node that has come that we don't know about
+ push @pc19, $parent->add($origin, 0, 1);
+ $parent = Route::Node::get($origin); # reparent to me now.
+ }
+ $parent->np(1);
}
# do nodes
my %in;
if ($thing->{n}) {
for (split(/:/, $thing->{n})) {
- my ($here, $call) = unpack("A1 A*", $_);
+ my ($here, $call) = unpack("A1 A*", $_);
+ next if $call eq $main::mycall;
$in{$call} = $here;
}
}
if ($thing->{a}) {
for (split(/:/, $thing->{a})) {
my ($here, $call) = unpack("A1 A*", $_);
+ next if $call eq $main::mycall;
$in{$call} = $here;
}
}
my ($del, $add) = $parent->diff_nodes(keys %in);
- if ($add) {
- my @pc21;
+ if ($del) {
foreach my $call (@$del) {
+ next if $call eq $main::mycall;
RouteDB::delete($call, $chan_call);
my $ref = Route::Node::get($call);
- push @pc21, $ref->del($parent) if $ref;
+ if ($ref) {
+ push @pc21, grep {$_} $ref->del($parent);
+ }
}
- $thing->{pc21n} = \@pc21 if @pc21;
}
- if ($del) {
- my @pc19;
+ if ($add) {
foreach my $call (@$add) {
+ next if $call eq $main::mycall;
RouteDB::update($call, $chan_call);
my $here = $in{$call};
- push @pc19, $parent->add($call, 0, $here);
+ push @pc19, grep {$_} $parent->add($call, 0, $here);
}
- $thing->{pc19n} = \@pc19 if @pc19;
}
+ $thing->{pc21n} = \@pc21 if @pc21;
+ $thing->{pc19n} = \@pc19 if @pc19;
# now users
if ($thing->{u}) {
my $flag = shift;
my @out = $node->add_user($user, $flag);
- my $ur = _upd_user_rec($user, $node);
+ my $ur = _upd_user_rec($user, $node->{call});
$ur->put;
return @out;
}