From a4b3c35cfd53e148dca83db41b855db4127f64b8 Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 23 Jun 2004 13:23:55 +0000 Subject: Work around OSX strangneness with recvfrom on connection-oriented sockets git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 54dbc26720..d962875155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 23 22:23:37 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 01:45:27 2004 Dave Thomas * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation): diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 88c6423695..2cf100cac8 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -460,7 +460,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)); + if (alen) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */ + return rb_assoc_new(str, ipaddr((struct sockaddr*)buf)); + else + return rb_assoc_new(str, Qnil); + // return rb_assoc_new(str, ipaddr((struct sockaddr*)buf)); #ifdef HAVE_SYS_UN_H case RECV_UNIX: return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf)); -- cgit v1.2.3