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

Add Socket::Ifaddr.vhid on supported platforms [Feature #13803]

Browse Source 
patched by Alan Somers

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-08-31 08:29:38 +00:00
parent 9f1994ed5c
commit e7ddf8788f
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/socket/extconf.rb
View File

@ -476,6 +476,7 @@ EOF
have_func('inet_aton("", (struct in_addr *)0)', headers) have_func('inet_aton("", (struct in_addr *)0)', headers)
have_func('getservbyport(0, "")', headers) have_func('getservbyport(0, "")', headers)
have_func("getifaddrs((struct ifaddrs **)NULL)", headers) have_func("getifaddrs((struct ifaddrs **)NULL)", headers)
have_struct_member("struct if_data", "ifi_vhid", headers) # FreeBSD
have_func("getpeereid", headers) have_func("getpeereid", headers)

24
ext/socket/ifaddr.c
View File

@ -256,6 +256,27 @@ ifaddr_dstaddr(VALUE self)
return Qnil; return Qnil;
} }
#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
/*
* call-seq:
* ifaddr.vhid => Integer
*
* Returns the vhid address of _ifaddr_.
* nil is returned if there is no vhid
*/
static VALUE
ifaddr_vhid(VALUE self)
{
rb_ifaddr_t *rifaddr = get_ifaddr(self);
struct ifaddrs *ifa = rifaddr->ifaddr;
if (ifa->ifa_data)
return (INT2FIX(((struct if_data*)ifa->ifa_data)->ifi_vhid));
else
return Qnil;
}
#endif
static void static void
ifaddr_inspect_flags(ifa_flags_t flags, VALUE result) ifaddr_inspect_flags(ifa_flags_t flags, VALUE result)
{ {
@ -453,6 +474,9 @@ rsock_init_sockifaddr(void)
rb_define_method(rb_cSockIfaddr, "netmask", ifaddr_netmask, 0); rb_define_method(rb_cSockIfaddr, "netmask", ifaddr_netmask, 0);
rb_define_method(rb_cSockIfaddr, "broadaddr", ifaddr_broadaddr, 0); rb_define_method(rb_cSockIfaddr, "broadaddr", ifaddr_broadaddr, 0);
rb_define_method(rb_cSockIfaddr, "dstaddr", ifaddr_dstaddr, 0); rb_define_method(rb_cSockIfaddr, "dstaddr", ifaddr_dstaddr, 0);
#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
rb_define_method(rb_cSockIfaddr, "vhid", ifaddr_vhid, 0);
#endif
#endif #endif
rb_define_singleton_method(rb_cSocket, "getifaddrs", socket_s_getifaddrs, 0); rb_define_singleton_method(rb_cSocket, "getifaddrs", socket_s_getifaddrs, 0);