loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

-version 1.991, 2009/03/21 20:56:55
+version 1.992, 2009/03/21 21:43:46
  Line 9046  sub get_dns {
  	return %iphost;
      }
- }
- #
+     #
- #  Given a DNS returns the loncapa host name for that DNS
+     #  Given a DNS returns the loncapa host name for that DNS
- #
+     #
- sub host_from_dns {
+     sub host_from_dns {
-     my ($dns) = @_;
+         my ($dns) = @_;
-     my @hosts;
+         my @hosts;
-     my $ip;
+         my $ip;
-     $ip = gethostbyname($dns);	# Initial translation to IP is in net order.
+         if (defined($name_to_ip{$dns})) {
-     if (length($ip) == 4) {
+             $ip = $name_to_ip{$dns};
- 	$ip   = &IO::Socket::inet_ntoa($ip);
+         }
- 	@hosts = get_hosts_from_ip($ip);
+         if (!$ip) {
- 	return $hosts[0];
+             $ip = gethostbyname($dns); # Initial translation to IP is in net order.
+             if (length($ip) == 4) {
+ 	        $ip   = &IO::Socket::inet_ntoa($ip);
+             }
+         }
+         if ($ip) {
+ 	    @hosts = get_hosts_from_ip($ip);
+ 	    return $hosts[0];
+         }
+         return undef;
      }
-     return undef;
  }
  BEGIN {