X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=6591c511a7e5cc8fd81dd3f3e965b31814f59541;hb=a35c16af85ef1707879f24e065a66ba3c9ae60c1;hp=1094578e61e08429ab4df159c237c75c2720708f;hpb=ed6790555f077eb521b8805113155a2ff99cc47e;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 1094578e..6591c511 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -50,6 +50,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 $pc92_update_period $last_pc92_update ); $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 @@ -70,6 +71,7 @@ $ann_to_talk = 1; $rspfcheck = 1; $eph_restime = 180; $eph_info_restime = 60*60; +$eph_pc15_restime = 6*60; $eph_pc34_restime = 30; $pingint = 5*60; $obscount = 2; @@ -77,6 +79,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 = 60*60; # the period between PC92 C updates +$last_pc92_update = time; # the last time a PC92 config update + @checklist = ( @@ -365,6 +370,7 @@ sub normal $hops--; return if $hops < 0; $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e; + $field[-1] = "H$hops"; } # send it out for processing @@ -426,8 +432,12 @@ sub process eph_clean(); import_chat(); - + if ($main::systime >= $last_pc92_update + $pc92_update_period) { + send_pc92_update(); + $last_pc92_update = $main::systime; + } + $last10 = $t; } @@ -768,11 +778,72 @@ sub send_pc92_config my $node; dbg('DXProt::send_pc92_config') 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'); + } + } + + # 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(); + @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; + 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'); + } + } +} + +sub send_pc92_update +{ + my $self = shift; + my $node; + 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 if @dxchan; - $self->send_route_pc92($main::mycall, \&pc92c, scalar @localnodes, @localnodes); -} + 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(); + push @lines, pc92c($main::routeroot, @localnodes); + + + # 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(); + @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; + foreach $node (@localnodes) { + if ($node) { + my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users; + push @lines, pc92c($node, @rout); + } + } + + # broadcast the lines to all PC92 nodes + for (@lines) { + $main::me->broadcast_route_pc92('', undef, $_, 0); + } +} # # route a message down an appropriate interface for a callsign @@ -1012,7 +1083,7 @@ sub disconnect # broadcast to all other nodes that all the nodes connected to via me are gone unless ($pc39flag && $pc39flag == 2) { $self->route_pc21($main::mycall, undef, @rout) if @rout; - $self->route_pc92d($main::mycall, undef, $node); + $self->route_pc92d($main::mycall, undef, $main::routeroot, $node) if $node; } # remove outstanding pings @@ -1145,7 +1216,7 @@ sub broadcast_route_pc9x $line = &$generate(@_); } - $line =~ /\^H(\d+)\^$/; + $line =~ /\^H(\d+)\^\~?$/; unless ($1 > 0 && $self->{isolate}) { foreach $dxchan (@dxchan) { next if $dxchan == $self;