1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-24 13:02:59 +00:00
parent 7e20506eae
commit 0ae09794e5
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Feb 24 22:00:37 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.
Tue Feb 24 19:56:11 2009 Tanaka Akira <akr@fsij.org> Tue Feb 24 19:56:11 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (ancillary_timestamp): support SCM_BINTIME. * ext/socket/ancdata.c (ancillary_timestamp): support SCM_BINTIME.

16
ext/socket/socket.c
View File

@ -1407,6 +1407,9 @@ static VALUE
sockaddr_obj(struct sockaddr *addr) sockaddr_obj(struct sockaddr *addr)
{ {
socklen_t len; socklen_t len;
#if defined(AF_INET6) && defined(__KAME__)
struct sockaddr_in6 addr6;
#endif
if (addr == NULL) if (addr == NULL)
return Qnil; return Qnil;
@ -1419,6 +1422,19 @@ sockaddr_obj(struct sockaddr *addr)
#ifdef AF_INET6 #ifdef AF_INET6
case AF_INET6: case AF_INET6:
len = sizeof(struct sockaddr_in6); len = sizeof(struct sockaddr_in6);
# ifdef __KAME__
/* KAME uses the 2nd 16bit word of link local IPv6 address as interface index internally */
/* convert fe80:1::1 to fe80::1%1 */
memcpy(&addr6, addr, len);
addr = (struct sockaddr *)&addr6;
if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
addr6.sin6_scope_id == 0 &&
(addr6.sin6_addr.s6_addr[2] || addr6.sin6_addr.s6_addr[3])) {
addr6.sin6_scope_id = (addr6.sin6_addr.s6_addr[2] << 8) | addr6.sin6_addr.s6_addr[3];
addr6.sin6_addr.s6_addr[2] = 0;
addr6.sin6_addr.s6_addr[3] = 0;
}
# endif
break; break;
#endif #endif