From ac0ba927f3914353b8bac6da9b93753a169fb4ef Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 23 Jun 2004 13:23:55 +0000 Subject: [PATCH] Work around OSX strangneness with recvfrom on connection-oriented sockets git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/socket/socket.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 50c3f1689a..64dfe9b717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 23 22:19:10 2004 Dave Thomas + + * ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem + with OS X not returning 'from' parameter to recvfrom for + connection-oriented sockets. + Wed Jun 23 22:16:16 2004 Michal Rokos * io.c: io_seek()'s retval should be checked [ruby-core:03045] diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 264b3fd731..42c4938c6d 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -492,7 +492,11 @@ s_recvfrom(sock, argc, argv, from) rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } #endif - return rb_assoc_new(str, ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP)); + if (alen) /* OSX doesn't return a from result for connection-oriented sockets */ + return rb_assoc_new(str, ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP)); + else + return rb_assoc_new(str, Qnil); + #ifdef HAVE_SYS_UN_H case RECV_UNIX: return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf));