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/socket.c | |
| parent | 6245caf58ccd2ccafc829c9c6a37b2b534c0a94d (diff) | |
| download | ruby-2ee08591190bed1f57a43a5cdd6486e3abfa664f.tar.gz | |
* 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/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 7e33de1411..abce61307a 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -688,13 +688,13 @@ sock_accept(VALUE sock) { rb_io_t *fptr; VALUE sock2; - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; GetOpenFile(sock, fptr); - sock2 = s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)buf,&len); + sock2 = s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)&buf,&len); - return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)buf, len)); + return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); } /* @@ -750,12 +750,12 @@ sock_accept_nonblock(VALUE sock) { rb_io_t *fptr; VALUE sock2; - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; GetOpenFile(sock, fptr); - sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)buf, &len); - return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)buf, len)); + sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)&buf, &len); + return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); } /* @@ -802,13 +802,13 @@ sock_sysaccept(VALUE sock) { rb_io_t *fptr; VALUE sock2; - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; GetOpenFile(sock, fptr); - sock2 = s_accept(0,fptr->fd,(struct sockaddr*)buf,&len); + sock2 = s_accept(0,fptr->fd,(struct sockaddr*)&buf,&len); - return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)buf, len)); + return rb_assoc_new(sock2, io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); } #ifdef HAVE_GETHOSTNAME |