diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-23 13:23:55 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-23 13:23:55 +0000 |
| commit | a4b3c35cfd53e148dca83db41b855db4127f64b8 (patch) | |
| tree | fa4a98e5bc7f69e5ca673ea241fbf59b1f1bd61e | |
| parent | a72f48f4d689a92705453a9a62fd07781288a3be (diff) | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Jun 23 22:23:37 2004 Dave Thomas <dave@pragprog.com> + + * 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 <dave@pragprog.com> * 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)); |