X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=bc6228b112b9c568149ea3ca78d3260366445875;hb=e2e4dadc448747744dacc0eb8d99ee950529a9b3;hp=fe018855286f4a2ca5603e089c6797874d79fd2c;hpb=7f15868bb42d0fd790dd41a886fc14127f4cf41c;p=spider.git diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm index fe018855..bc6228b1 100644 --- a/perl/Thingy/Rt.pm +++ b/perl/Thingy/Rt.pm @@ -76,12 +76,12 @@ sub handle_cf { my $thing = shift; my $dxchan = shift; - my $origin = $thing->{origin}; + my $origin = $thing->{user} || $thing->{origin}; my $chan_call = $dxchan->{call}; my $parent = Route::Node::get($origin); unless ($parent) { - dbg("Thingy::Rt::lcf: received from $origin on $chan_call unknown") if isdbg('chanerr'); + dbg("Thingy::Rt::cf: received from $thing->{origin}/$origin on $chan_call unknown") if isdbg('chanerr'); return; } @@ -158,6 +158,24 @@ sub handle_cf return $thing; } +# +# copy out the PC16 data for a node into the +# pc16n and u slots if there are any users +# +sub copy_node_pc16_data +{ + my $thing = shift; + my $uref = shift; + + my @u = $uref->users; + if (@u) { + $thing->{pc16n} = $uref; + $thing->{pc16u} = [map {Route::User::get($_)} @u]; + return scalar @u; + } + return undef; +} + sub _add_user { my $node = shift;