diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-02 05:12:39 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-02 05:12:39 +0000 |
| commit | 05bb6b505c1be3169a9c1e2bdd18c0c0ade0e9d4 (patch) | |
| tree | 93576a6e8ac68c69923e5b1946c64e257647c067 /ext/socket | |
| parent | 9388ed284d600f2225a745dfb3edb6ac1758fdb8 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 18 | ||||
| -rw-r--r-- | ext/socket/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 4 |
3 files changed, 26 insertions, 0 deletions
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; |