--- loncom/lonnet/perl/lonnet.pm 2007/06/25 23:34:34 1.890.2.3 +++ loncom/lonnet/perl/lonnet.pm 2007/06/18 22:49:57 1.891 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.890.2.3 2007/06/25 23:34:34 albertel Exp $ +# $Id: lonnet.pm,v 1.891 2007/06/18 22:49:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -214,6 +214,24 @@ sub reply { # ----------------------------------------------------------- Send USR1 to lonc sub reconlonc { + my ($lonid) = @_; + my $hostname = &hostname($lonid); + if ($lonid) { + my $peerfile="$perlvar{'lonSockDir'}/$hostname"; + if ($hostname && -e $peerfile) { + &logthis("Trying to reconnect lonc for $lonid ($hostname)"); + my $client=IO::Socket::UNIX->new(Peer => $peerfile, + Type => SOCK_STREAM, + Timeout => 10); + if ($client) { + print $client ("reset_retries\n"); + my $answer=<$client>; + #reset just this one. + } + } + return; + } + &logthis("Trying to reconnect lonc"); my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; if (open(my $fh,"<$loncfile")) { @@ -1378,7 +1396,7 @@ sub ssi { my $request; $form{'no_update_last_known'}=1; - &Apache::lonenc::check_encrypt(\$fn); + if (%form) { $request=new HTTP::Request('POST',&absolute_url().$fn); $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form)); @@ -7854,7 +7872,6 @@ sub get_dns { sub reset_hosts_info { &reset_domain_info(); &reset_hosts_ip_info(); - undef(%name_to_host); undef(%hostname); undef(%hostdom); undef(%libserv); @@ -7946,6 +7963,24 @@ sub get_dns { my %name_to_ip; my %lonid_to_ip; + my %valid_ip; + sub valid_ip { + my ($ip) = @_; + if (exists($iphost{$ip}) || exists($valid_ip{$ip})) { + return 1; + } + my $name = gethostbyip($ip); + my $lonid = &hostname($name); + if (defined($lonid)) { + $valid_ip{$ip} = $lonid; + return 1; + } + my %iphosts = &get_iphost(); + if (ref($iphost{$ip})) { + return 1; + } + } + sub get_hosts_from_ip { my ($ip) = @_; my %iphosts = &get_iphost(); @@ -7977,7 +8012,6 @@ sub get_dns { sub get_iphost { my ($ignore_cache) = @_; - if (!$ignore_cache) { if (%iphost) { return %iphost; @@ -7991,31 +8025,16 @@ sub get_dns { return %iphost; } } - - # get yesterday's info for fallback - my %old_name_to_ip; - my ($ip_info,$cached)= - &Apache::lonnet::is_cached_new('iphost','iphost'); - if ($cached) { - %old_name_to_ip = %{$ip_info->[1]}; - } - my %name_to_host = &all_names(); foreach my $name (keys(%name_to_host)) { my $ip; if (!exists($name_to_ip{$name})) { $ip = gethostbyname($name); if (!$ip || length($ip) ne 4) { - if (defined($old_name_to_ip{$name})) { - $ip = $old_name_to_ip{$name}; - &logthis("Can't find $name defaulting to old $ip"); - } else { - &logthis("Name $name no IP found"); - next; - } - } else { - $ip=inet_ntoa($ip); + &logthis("Skipping name $name no IP found"); + next; } + $ip=inet_ntoa($ip); $name_to_ip{$name} = $ip; } else { $ip = $name_to_ip{$name}; @@ -8027,7 +8046,7 @@ sub get_dns { } &Apache::lonnet::do_cache_new('iphost','iphost', [\%iphost,\%name_to_ip,\%lonid_to_ip], - 48*60*60); + 24*60*60); return %iphost; }