diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 11:19:57 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-09 11:19:57 +0000 |
| commit | d6ed723d5f28d9b6601529c1c4f24a43453e7b69 (patch) | |
| tree | 84f25e152b70dfebb53cf79d4a7deec7e86a087f | |
| parent | 32ebe14d88cd0701fa5fa1b3cf093409b271dde7 (diff) | |
| download | ruby-d6ed723d5f28d9b6601529c1c4f24a43453e7b69.tar.gz ruby-d6ed723d5f28d9b6601529c1c4f24a43453e7b69.tar.xz ruby-d6ed723d5f28d9b6601529c1c4f24a43453e7b69.zip | |
* ext/socket/basicsocket.c (bsock_getsockname): use sockaddr_storage.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/socket/basicsocket.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Feb 9 20:19:36 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/basicsocket.c (bsock_getsockname): use sockaddr_storage. + Mon Feb 9 20:11:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/win32ole/win32ole.c (load_conv_function51932): fixed for the diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index fdd2ce722..f6fb9f264 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -326,14 +326,14 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname) static VALUE bsock_getsockname(VALUE sock) { - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getsockname(fptr->fd, (struct sockaddr*)buf, &len) < 0) + if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0) rb_sys_fail("getsockname(2)"); - return rb_str_new(buf, len); + return rb_str_new((char*)&buf, len); } /* |