diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-24 23:10:55 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-24 23:10:55 +0000 |
commit | 2c7c9e82df0293da4b55ae6886b0870727c8178f (patch) | |
tree | 0ecdaac76209471e47095de657ee27a7f9a6526b /ext | |
parent | 0f1db9d8a4706cff9909252ef5dc9ba61ffc220f (diff) | |
download | ruby-2c7c9e82df0293da4b55ae6886b0870727c8178f.tar.gz |
* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
should give us packed address, not struct sockaddr.
[ruby-core:03053]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/socket.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 42c4938c6d..0f4ffdd2b2 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 |