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

* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id

Browse Source 
if getifaddrs() returns an IPv6 link local address which
  sin6_scope_id is zero, such as on OpenIndiana SunOS 5.11.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-05-06 11:51:07 +00:00
parent 85bfd7308f
commit 9e08404b8a
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon May 6 20:50:37 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id
if getifaddrs() returns an IPv6 link local address which
sin6_scope_id is zero, such as on OpenIndiana SunOS 5.11.
Sun May 5 18:56:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun May 5 18:56:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def (defined): use vm_search_superclass() like as normal super * insns.def (defined): use vm_search_superclass() like as normal super

20
ext/socket/socket.c
View File

@ -1658,6 +1658,26 @@ socket_s_ip_address_list(VALUE self)
for (p = ifp; p; p = p->ifa_next) { for (p = ifp; p; p = p->ifa_next) {
if (p->ifa_addr != NULL && IS_IP_FAMILY(p->ifa_addr->sa_family)) { if (p->ifa_addr != NULL && IS_IP_FAMILY(p->ifa_addr->sa_family)) {
struct sockaddr *addr = p->ifa_addr; struct sockaddr *addr = p->ifa_addr;
#if defined(AF_INET6)
/*
* OpenIndiana SunOS 5.11 getifaddrs() returns IPv6 link local
* address with sin6_scope_id == 0.
* So fill it from the interface name (ifa_name).
*/
struct sockaddr_in6 addr6;
if (addr->sa_family == AF_INET6) {
socklen_t len = (socklen_t)sizeof(struct sockaddr_in6);
memcpy(&addr6, addr, len);
addr = (struct sockaddr *)&addr6;
if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
addr6.sin6_scope_id == 0) {
unsigned int ifindex = if_nametoindex(p->ifa_name);
if (ifindex != 0) {
addr6.sin6_scope_id = ifindex;
}
}
}
#endif
rb_ary_push(list, sockaddr_obj(addr, sockaddr_len(addr))); rb_ary_push(list, sockaddr_obj(addr, sockaddr_len(addr)));
} }
} }