From: minima Date: Tue, 22 Feb 2005 17:25:10 +0000 (+0000) Subject: Allow dependant nodes to send pc16 data X-Git-Tag: R_1_52~166 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e2e4dadc448747744dacc0eb8d99ee950529a9b3;p=spider.git Allow dependant nodes to send pc16 data --- diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 35f91fef..8f16da66 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -1094,6 +1094,9 @@ sub handle_20 $self->send(pc22()); $self->state('normal'); $self->{lastping} = 0; + my $thing = Thingy::Rt->new(user=>$self->{call}); + my $nref = Route::Node::get($self->{call}); + $thing->broadcast if $thing->copy_pc16_data($nref); } # delete a cluster from the list @@ -1174,6 +1177,9 @@ sub handle_22 my $origin = shift; $self->state('normal'); $self->{lastping} = 0; + my $thing = Thingy::Rt->new(user=>$self->{call}); + my $nref = Route::Node::get($self->{call}); + $thing->broadcast if $thing->copy_pc16_data($nref); } # WWV info 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;