use numerichost if cannot resolve hostname

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 044605120..8d7376175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
+	  hostname.
+
 Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 2c3d63b9c..8cf54e1e1 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -705,13 +705,13 @@ ipaddr(sockaddr)
 	family = rb_str_new2(pbuf);
 	break;
     }
+    addr1 = Qnil;
     if (!do_not_reverse_lookup) {
 	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			    NULL, 0, 0);
-	if (error) {
-	    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+	if (! error) {
+	    addr1 = rb_str_new2(hbuf);
 	}
-	addr1 = rb_str_new2(hbuf);
     }
     error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
@@ -719,7 +719,7 @@ ipaddr(sockaddr)
 	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
     }
     addr2 = rb_str_new2(hbuf);
-    if (do_not_reverse_lookup) {
+    if (addr1 == Qnil) {
 	addr1 = addr2;
     }
     port = INT2FIX(atoi(pbuf));