From eb166d591641c4caa1a6f6f27a2fa28a1c056814 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Jun 2004 23:31:29 +0000
Subject: * eval.c (rb_thread_atfork): remove "fork terminates thread"  
 warning.  [ruby-dev:

* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
  [ruby-core:02786][ruby-core:03067]

* 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/branches/ruby_1_8@6516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/socket.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'ext/socket/socket.c')

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 2cf100cac..574bb3963 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2044,7 +2044,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
-- 
cgit