From cc779adb39686dd3a388685fadc5bf41d829d069 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 10 Feb 2009 14:31:21 +0000 Subject: * ext/socket/basicsocket.c (bsock_getpeername): use struct sockaddr_storage. (bsock_local_address): ditto. (bsock_remote_address): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/basicsocket.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index 7690fb60e..88f8b1ba6 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -351,14 +351,14 @@ bsock_getsockname(VALUE sock) static VALUE bsock_getpeername(VALUE sock) { - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getpeername(fptr->fd, (struct sockaddr*)buf, &len) < 0) + if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0) rb_sys_fail("getpeername(2)"); - return rb_str_new(buf, len); + return rb_str_new((char*)&buf, len); } /* @@ -377,14 +377,14 @@ bsock_getpeername(VALUE sock) static VALUE bsock_local_address(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 fd_socket_addrinfo(fptr->fd, (struct sockaddr *)buf, len); + return fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len); } /* @@ -405,14 +405,14 @@ bsock_local_address(VALUE sock) static VALUE bsock_remote_address(VALUE sock) { - char buf[1024]; + struct sockaddr_storage buf; socklen_t len = sizeof buf; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getpeername(fptr->fd, (struct sockaddr*)buf, &len) < 0) + if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0) rb_sys_fail("getpeername(2)"); - return fd_socket_addrinfo(fptr->fd, (struct sockaddr *)buf, len); + return fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len); } /* -- cgit