sub gen_Aranea
{
my $thing = shift;
+ my $dxchan = shift;
+
unless ($thing->{Aranea}) {
my $ref;
if ($ref = $thing->{anodes}) {
- $thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+ $thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
}
- if ($ref = $thing->{anodes}) {
- $thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+ if ($ref = $thing->{pnodes}) {
+ $thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
}
if ($ref = $thing->{ausers}) {
- $thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+ $thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
}
$thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
}
+
return $thing->{Aranea};
}
sub from_Aranea
{
my $thing = shift;
- return unless $thing;
+ $thing->{u} ||= '';
+ $thing->{n} ||= '';
+ $thing->{a} ||= '';
return $thing;
}
{
my $thing = shift;
my $dxchan = shift;
- my $origin = $thing->{user} || $thing->{origin};
+ my $origin = $thing->{origin};
my $chan_call = $dxchan->{call};
my $parent = Route::Node::get($origin);
unless ($parent) {
- dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr');
+ dbg("Thingy::Rt::cf: received from $origin on $chan_call unknown") if isdbg('chanerr');
return;
}
+ $parent->np(1);
+
+ my @pc19;
+ my @pc21;
+
+ # 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 ($del, $add);
my %in;
if ($thing->{n}) {
- %in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{n});
- my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
- $add = $tadd;
- $del = $tdel;
+ for (split(/:/, $thing->{n})) {
+ my ($here, $call) = unpack("A1 A*", $_);
+ next if $call eq $main::mycall;
+ $in{$call} = $here;
+ }
}
if ($thing->{a}) {
- %in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{a});
- my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
- push @$add, @$tadd;
- push @$del, @$tdel;
+ for (split(/:/, $thing->{a})) {
+ my ($here, $call) = unpack("A1 A*", $_);
+ next if $call eq $main::mycall;
+ $in{$call} = $here;
+ }
}
- if ($add) {
- my @pc21;
+ my ($del, $add) = $parent->diff_nodes(keys %in);
+ 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;
}
- $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 $ref = Route::Node::get($call);
- push @pc19, $parent->add($call, 0, $in{$call}) unless $ref;
+ my $here = $in{$call};
+ push @pc19, $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}) {
$thing->{'s'} = 'cf';
- my @u = $uref->users;
- if (@u) {
- $thing->{pc16n} = $uref;
- $thing->{pc16u} = [map {Route::User::get($_)} @u];
- return scalar @u;
- }
- return undef;
+ my @u = map {Route::User::get($_)} $uref->users;
+ $thing->{ausers} = \@u if @u;
+ return @u;
}