diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 14:46:51 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 14:46:51 +0000 |
commit | 2ee08591190bed1f57a43a5cdd6486e3abfa664f (patch) | |
tree | 6e615bf2be2733a130abd9876e02c2ddd8f6cbfe /ext/socket/ancdata.c | |
parent | 6245caf58ccd2ccafc829c9c6a37b2b534c0a94d (diff) |
* ext/socket/init.c (struct recvfrom_arg): use struct
sockaddr_storage.
(recvfrom_blocking): follow struct recvfrom_arg change.
(s_recvfrom): ditto.
(s_recvfrom_nonblock): use struct sockaddr_storage.
* ext/socket/socket.c (sock_accept): use struct sockaddr_storage.
(sock_accept_nonblock): ditto.
(sock_sysaccept): ditto.
* ext/socket/ancdata.c (bsock_recvmsg_internal): use struct
sockaddr_storage.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/ancdata.c')
-rw-r--r-- | ext/socket/ancdata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 5e6920de1a..7f55f3b4fd 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -952,7 +952,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) #if defined(HAVE_ST_MSG_CONTROL) struct cmsghdr *cmh; #endif - char namebuf[1024]; + struct sockaddr_storage namebuf; char datbuf0[4096], *datbuf; char ctlbuf0[4096], *ctlbuf; VALUE dat_str = Qnil; @@ -1014,8 +1014,8 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) memset(&mh, 0, sizeof(mh)); - memset(namebuf, 0, sizeof(namebuf)); - mh.msg_name = namebuf; + memset(&namebuf, 0, sizeof(namebuf)); + mh.msg_name = (struct sockaddr *)&namebuf; mh.msg_namelen = sizeof(namebuf); mh.msg_iov = &iov; |