X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=e33a310f2268f394e07271b1745f9f365381b094;hb=04df6cab5929c30a48a2865acda598e3ca541f1d;hp=9736379197f774b7d1653458c46d2aa41a07aee3;hpb=ef2bc0f99b5022339b14dcc56f49547220b79f11;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 97363791..e33a310f 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -32,7 +32,6 @@ use DXHash; use Route; use Route::Node; use Script; -use Investigate; use RouteDB; use DXProtHandle; @@ -50,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $investigation_int $pc19_version $myprot_version %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck $allowzero $decode_dk0wcy $send_opernam @checklist - $eph_pc15_restime + $eph_pc15_restime $pc92_update_period $last_pc92_update ); $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 @@ -79,6 +78,9 @@ $chatdupeage = 20 * 60 * 60; $chatimportfn = "$main::root/chat_import"; $investigation_int = 12*60*60; # time between checks to see if we can see this node $pc19_version = 5466; # the visible version no for outgoing PC19s generated from pc59 +$pc92_update_period = 30*60; # the period between PC92 C updates +$last_pc92_update = time + int rand(180); # the last time a PC92 config update + @checklist = ( @@ -429,8 +431,12 @@ sub process eph_clean(); import_chat(); - + if ($main::systime >= $last_pc92_update + $pc92_update_period) { + send_pc92_update(); + $last_pc92_update = $main::systime + int rand(180); + } + $last10 = $t; } @@ -765,33 +771,35 @@ sub send_local_config } } -sub send_pc92_config +sub gen_pc92_update { my $self = shift; + my $with_pc92_nodes = shift; my $node; - - dbg('DXProt::send_pc92_config') if isdbg('trace'); + my @lines; + + dbg('DXProt::send_pc92_update') if isdbg('trace'); # send 'my' configuration for all users and pc92 capable nodes my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all(); my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan; # push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users(); - $self->send_route_pc92($main::mycall, \&pc92c, (scalar @localnodes)+1, $main::routeroot, @localnodes); - - # send out the configuration of all the PC92 nodes with current configuration - # but with the dates that the last config came in with. - @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes(); - @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; - foreach $node (@localnodes) { - if ($node && $node->lastid->{92}) { - my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users; - my $line = gen_pc29_with_time($node->call, 'C', $node->lastid->{92}, @rout); - $self->send($line); - } else { - dbg("sent a null value") if isdbg('chanerr'); + push @lines, pc92c($main::routeroot, @localnodes); + + + if ($with_pc92_nodes) { + # send out the configuration of all the PC92 nodes with current configuration + # but with the dates that the last config came in with. + @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes(); + @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; + foreach $node (@localnodes) { + if ($node && $node->lastid->{92}) { + my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users; + push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout); + } } } - + # send the configuration of all the 'external' nodes that don't handle PC92 # out with the 'external' marker on the first node. @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes(); @@ -799,10 +807,34 @@ sub send_pc92_config foreach $node (@localnodes) { if ($node) { my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users; - $self->send_route_pc92($main::mycall, \&pc92c, 1, $node, @rout) if @rout; - } else { - dbg("sent a null value") if isdbg('chanerr'); - } + push @lines, pc92c($node, @rout); + } + } + return @lines; +} + + +sub send_pc92_config +{ + my $self = shift; + + dbg('DXProt::send_pc92_config') if isdbg('trace'); + + my @out = $self->gen_pc92_update(1); + + # send the complete config out on this interface + for (@out) { + $self->send($_); + } +} + +sub send_pc92_update +{ + my @out = $main::me->gen_pc92_update(0); + + # broadcast the lines to all PC92 nodes + for (@out) { + $main::me->broadcast_route_pc9x('', undef, $_, 0); } }