diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 18 | ||||
| -rw-r--r-- | ext/socket/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 4 |
4 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,13 @@ +Tue Sep 2 14:09:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX). + the patch is submitted by nmu <nmu@users.sourceforge.jp>. + + * ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on + some platforms. + + * ext/socket/getnameinfo.c (getnameinfo): ditto. + Tue Sep 2 14:02:19 2003 <nagai@ai.kyutech.ac.jp> * ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception @@ -141,8 +151,8 @@ Thu Aug 28 17:30:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org> included modules, if klass is Object. [ruby-talk:79302] * numeric.c (check_uint): check should be done using UINT_MAX, not - INT_MAX. this fix is submitted by <lyle@knology.net> in - [ruby-core:01486] + INT_MAX. this fix is submitted by Lyle Johnson + <lyle@knology.net> in [ruby-core:01486] Thu Aug 28 05:02:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org> diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 45e596700c..357025cbbb 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -321,6 +321,24 @@ $objs = ["socket.#{$OBJEXT}"] if $getaddr_info_ok and have_func("getaddrinfo") and have_func("getnameinfo") have_getaddrinfo = true +else + if try_link(<<EOF) +#include <sys/types.h> +#include <netdb.h> +#include <string.h> +#include <sys/socket.h> +#include <netinet/in.h> +int +main() +{ + struct in6_addr addr; + unsigned char c; + c = addr.s6_addr8; + return 0; +} +EOF + $CFLAGS="-DHAVE_ADDR8 "+$CFLAGS + end end if have_getaddrinfo diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index a6c26a8f0f..4f58a23d2d 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -480,7 +480,11 @@ getaddrinfo(hostname, servname, hints, res) break; #ifdef INET6 case AF_INET6: +#ifdef HAVE_ADDR8 pfx = ((struct in6_addr *)pton)->s6_addr8[0]; +#else + pfx = ((struct in6_addr *)pton)->s6_addr[0]; +#endif if (pfx == 0 || pfx == 0xfe || pfx == 0xff) pai->ai_flags &= ~AI_CANONNAME; break; diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index a1fa5d7908..a75f233a81 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -208,7 +208,11 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) break; #ifdef INET6 case AF_INET6: +#ifdef HAVE_ADDR8 pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0]; +#else + pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0]; +#endif if (pfx == 0 || pfx == 0xfe || pfx == 0xff) flags |= NI_NUMERICHOST; break; |