X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4e32c22e77940e1eea3db025e85a55b08c0039ca;hb=aeb4c8591de710bd8de14f33817d2f0aabbd5e28;hp=6591c511a7e5cc8fd81dd3f3e965b31814f59541;hpb=a35c16af85ef1707879f24e065a66ba3c9ae60c1;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 6591c511..4e32c22e 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -32,18 +32,12 @@ use DXHash; use Route; use Route::Node; use Script; -use Investigate; use RouteDB; use DXProtHandle; use strict; use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; - use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime $last_hour $last10 %eph %pings %rcmds $ann_to_talk $pingint $obscount %pc19list $chatdupeage $chatimportfn @@ -53,6 +47,8 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $eph_pc15_restime $pc92_update_period $last_pc92_update ); +($VERSION, $BRANCH) = dxver(q$Revision$); + $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 $pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23 @@ -79,8 +75,8 @@ $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 +$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 = @@ -225,6 +221,8 @@ sub init $main::me->{registered} = 1; $main::me->{version} = $main::version; $main::me->{build} = $main::build; + $main::me->{do_pc92} = 1; + $main::me->{via_pc92} = 1; } # @@ -238,6 +236,14 @@ sub new # add this node to the table, the values get filled in later my $pkg = shift; my $call = shift; + + # if we have an entry already, then send a PC21 to all connect + # old style connections, because we are about to get the real deal + if (my $ref = Route::Node::get($call)) { + dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route'); + my @rout = $ref->delete; + $self->route_pc21($main::mycall, undef, @rout) if @rout; + } $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall; return $self; @@ -365,12 +371,14 @@ sub normal } # modify the hop count here - if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) { - $trail ||= ''; - $hops--; - return if $hops < 0; - $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e; - $field[-1] = "H$hops"; + if ($self != $main::me) { + if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) { + $trail ||= ''; + $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 @@ -434,8 +442,10 @@ sub process import_chat(); if ($main::systime >= $last_pc92_update + $pc92_update_period) { + dbg("ROUTE: sending pc92 update") if isdbg('route'); send_pc92_update(); - $last_pc92_update = $main::systime; + time_out_pc92_routes(); + $last_pc92_update = $main::systime + int rand(180); } $last10 = $t; @@ -772,79 +782,120 @@ sub send_local_config } } -sub send_pc92_config +sub gen_my_pc92_config +{ + my $node = shift; + + if ($node->{call} eq $main::mycall) { + my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all(); + dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow'); + my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan; + dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow'); + return pc92c($main::routeroot, @localnodes); + } else { + my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users; + return pc92c($node, @rout); + } +} + +sub gen_pc92_update { my $self = shift; + my $with_pc92_nodes = shift; my $node; + my @lines; + my @dxchan; + my @localnodes; - 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); + dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow'); - # 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 'my' configuration for all channels + push @lines, gen_my_pc92_config($main::routeroot); + + if ($with_pc92_nodes) { + # send out the configuration of all the directly connected 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(); + dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow'); + @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; + dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow'); + 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 + + # send the configuration of all the directly connected '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(); + dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow'); @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan; + dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow'); 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, gen_my_pc92_config($node); + } } -} -sub send_pc92_update + dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow'); + return @lines; +} + + +sub send_pc92_config { 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; -# push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users(); - push @lines, pc92c($main::routeroot, @localnodes); + dbg('DXProt::send_pc92_config') if isdbg('trace'); - # 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); - } + 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 (@lines) { - $main::me->broadcast_route_pc92('', undef, $_, 0); + for (@out) { + $main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0); } } +sub time_out_pc92_routes +{ + my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all(); + my @rdel; + foreach my $n (@nodes) { + my $o = $n->dec_obs; + if ($o <= 0) { + if (my $dxchan = DXChannel::get($n->call)) { + dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route'); + $dxchan->disconnect; + next; + } + my @parents = map {Route::Node::get($_)} $n->parents; + for (@parents) { + if ($_) { + dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route'); + push @rdel, $n->del($_); + } + } + } else { + dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route'); + } + } + for (@rdel) { + $main::me->route_pc21($main::mycall, undef, $_) if $_; + } +} + # # route a message down an appropriate interface for a callsign # @@ -1108,8 +1159,11 @@ sub talk { my ($self, $from, $to, $via, $line, $origin) = @_; - $line =~ s/\^/\\5E/g; # remove any ^ characters - $self->send(DXProt::pc10($from, $to, $via, $line, $origin)); + if ($self->{do_pc93}) { + $self->send(pc93($to, $from, $via, $line)); + } else { + $self->send(pc10($from, $to, $via, $line, $origin)); + } Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall; } @@ -1212,15 +1266,15 @@ sub broadcast_route_pc9x my @dxchan = DXChannel::get_all_nodes(); my $dxchan; - if ($origin eq $main::mycall) { + if ($origin eq $main::mycall && $generate && !$line) { $line = &$generate(@_); } $line =~ /\^H(\d+)\^\~?$/; unless ($1 > 0 && $self->{isolate}) { foreach $dxchan (@dxchan) { - next if $dxchan == $self; - next if $dxchan == $main::me; + next if $dxchan == $self || $dxchan == $main::me; + next if $origin eq $dxchan->{call}; # don't route some from this call back again. next unless $dxchan->{do_pc92}; next unless $dxchan->isa('DXProt');