increase PC41 dupe time, add CTY-2004 data

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5694ba05b217ba2f3b9a9adcda4ec1b712235217..72f411949861f581e7567d1edcb4203d00fe0164 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -65,14 +65,14 @@ $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $eph_restime = 60;
-$eph_info_restime = 60*60;
+$eph_info_restime = 18*60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
 $chatdupeage = 20 * 60;
 $chatimportfn = "$main::root/chat_import";
-$pc19_version = 5454;                  # the visible version no for outgoing PC19s generated from pc59
+$pc19_version = 5455;                  # the visible version no for outgoing PC19s generated from pc59
 $pc92_update_period = 4*60*60; # the period between outgoing PC92 C updates
 $pc92_short_update_period = 15*60; # shorten the update period after a connection or start up
 $pc92_extnode_update_period = 1*60*60; # the update period for external nodes
@@ -269,7 +269,7 @@ sub new
                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;
+       $main::routeroot->add($call, '5000', Route::here(1), $self->{conn}->peerhost) if $call ne $main::mycall;
 
        return $self;
 }
@@ -284,7 +284,7 @@ sub start
        my $user = $self->{user};
 
        # log it
-       my $host = $self->{conn}->{peerhost};
+       my $host = $self->{conn}->peerhost;
        $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
        $host ||= "unknown";
 
@@ -294,7 +294,7 @@ sub start
        $self->{consort} = $line;
        $self->{outbound} = $sort eq 'O';
        my $priv = $user->priv;
-       $priv = $user->priv(1) unless $priv;
+       $priv = $user->priv(1) unless defined $priv;
        $self->{priv} = $priv;     # other clusters can always be 'normal' users
        $self->{lang} = $user->lang || 'en';
        $self->{isolate} = $user->{isolate};