* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()

  should give us packed address, not struct sockaddr.
  [ruby-core:03053]


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

1 files changed, 18 insertions, 1 deletions

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 42c4938c6..0f4ffdd2b 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2095,7 +2095,24 @@ sock_sockaddr(addr, len)
     struct sockaddr *addr;
     size_t len;
 {
-    return rb_str_new((char*)addr, len);
+    char *ptr;
+
+    switch (addr->sa_family) {
+      case AF_INET:
+	ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
+	len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
+	break;
+#ifdef INET6
+      case AF_INET6:
+	ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
+	len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
+	break;
+#endif
+      default:
+        rb_raise(rb_eSocket, "unknown socket family:%d", addr->sa_family);
+	break;
+    }
+    return rb_str_new(ptr, len);
 }
 
 static VALUE