K records only come from $mycall

The hourly C records for external nodes will be fine for
keepalive purposes.
Remove all references to Investigate.

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1cee4da0fd6006ad1e3c9cdef6fb1a94d33a16ef..fdd3025a99bd290d19669c0a24adec5d438499f7 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -506,22 +506,11 @@ sub process
                                        $dxchan->update_pc92_next; # this won't actually do anything, it's just to be tidy
                                }
                        }
+               }
 
-                       # do the keepalives in the same way, but use a different timer
-                       if ($main::systime >= $dxchan->{next_pc92_keepalive}) {
-                               if ($dxchan == $main::me || !$dxchan->{do_pc9x}) {
-                                       dbg("ROUTE: pc92 keepalive candidate: $dxchan->{call}") if isdbg('obscount');
-                                       my $ref = Route::Node::get($dxchan->{call});
-                                       if ($dxchan == $main::me || ($ref && ($ref->measure_pc9x_t($main::systime-$main::systime_daystart)) >= $pc92_keepalive_period/2)) {
-                                               $dxchan->broadcast_pc92_keepalive($dxchan->{call});
-                                       } else {
-                                               $dxchan->update_pc92_keepalive;
-                                       }
-                               } else {
-#                                      $dxchan->update_pc92_next; # this won't actually do anything, it's just to be tidy
-                                       $dxchan->update_pc92_keepalive;
-                               }
-                       }
+               # do the keepalive for me, if required
+               if ($main::systime >= $main::me->{next_pc92_keepalive}) {
+                       $main::me->broadcast_pc92_keepalive($main::mycall);
                }
 
                if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) {

diff --git a/perl/DXXml/Cmd.pm b/perl/DXXml/Cmd.pm
index 9aab10cbd2d3fe530e8ffcfe3111094be1d893ea..f9521e46c61af1882f3a71a7aff9b2121f006888 100644 (file)
--- a/perl/DXXml/Cmd.pm
+++ b/perl/DXXml/Cmd.pm
@@ -13,7 +13,6 @@ package DXXml::Cmd;
 use DXDebug;
 use DXProt;
 use IsoTime;
-use Investigate;
 use DXXml::Text;
 use DXLog;
 

diff --git a/perl/DXXml/IM.pm b/perl/DXXml/IM.pm
index 651de8ba41aaf26e7e3a3271453f06329df324ba..893e0c9cda47e816efe50d349f5b29121f8b0f0c 100644 (file)
--- a/perl/DXXml/IM.pm
+++ b/perl/DXXml/IM.pm
@@ -13,7 +13,6 @@ package DXXml::IM;
 use DXDebug;
 use DXProt;
 use IsoTime;
-use Investigate;
 use Time::HiRes qw(gettimeofday tv_interval);
 
 use vars qw(@ISA);

diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 4fee5f75544ebbd227f4467e281a97c92f00e6aa..04f830d1b534a8d701a32289a0b5d19c2db2ba29 100644 (file)
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -13,7 +13,6 @@ package DXXml::Ping;
 use DXDebug;
 use DXProt;
 use IsoTime;
-use Investigate;
 use Time::HiRes qw(gettimeofday tv_interval);
 
 use vars qw(@ISA %pings);
@@ -131,14 +130,10 @@ sub _handle_believe
 {
        my ($from, $via) = @_;
        
-       if (my $ivp = Investigate::get($from, $via)) {
-               $ivp->handle_ping;
-       } else {
-               my $user = DXUser->get_current($from);
-               if ($user) {
-                       $user->set_believe($via);
-                       $user->put;
-               }
+       my $user = DXUser->get_current($from);
+       if ($user) {
+               $user->set_believe($via);
+               $user->put;
        }
 }
 1;

diff --git a/perl/Version.pm b/perl/Version.pm
index adfe2463fc684b3d7807dbd9ad7489496d8d616b..b75aaed4aa6a3f6ddb06c5696ef378bcd3460f5e 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '146';
+$build = '147';
 
 1;