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

* win32/win32.c (getipaddrs): use alternamtive interface name if

Browse Source 
available, because if_nametoindex() requires them.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-05-13 12:21:53 +00:00
parent cb3fcdcdc3
commit dd4687313c
2 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 13 21:20:32 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (getipaddrs): use alternamtive interface name if
available, because if_nametoindex() requires them.
Mon May 13 20:23:24 2013 NAKAMURA Usaku <usa@ruby-lang.org> Mon May 13 20:23:24 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c, include/ruby/win32.h (getipaddrs): [experimental] * win32/win32.c, include/ruby/win32.h (getipaddrs): [experimental]

70
win32/win32.c
View File

@ -3737,6 +3737,46 @@ socketpair(int af, int type, int protocol, int *sv)
} }
/* License: Ruby's */ /* License: Ruby's */
static void
str2guid(const char *str, GUID *guid)
{
#define hex2byte(str) \
((isdigit(*(str)) ? *(str) - '0' : toupper(*(str)) - 'A' + 10) << 4 | (isdigit(*((str) + 1)) ? *((str) + 1) - '0' : toupper(*((str) + 1)) - 'A' + 10))
char *end;
int i;
if (*str == '{') str++;
guid->Data1 = (long)strtoul(str, &end, 16);
str += 9;
guid->Data2 = (unsigned short)strtoul(str, &end, 16);
str += 5;
guid->Data3 = (unsigned short)strtoul(str, &end, 16);
str += 5;
guid->Data4[0] = hex2byte(str);
str += 2;
guid->Data4[1] = hex2byte(str);
str += 3;
for (i = 0; i < 6; i++) {
guid->Data4[i + 2] = hex2byte(str);
str += 2;
}
}
/* License: Ruby's */
#ifndef _IFDEF_
typedef struct {
uint64_t Value;
struct {
uint64_t Reserved :24;
uint64_t NetLuidIndex :24;
uint64_t IfType :16;
} Info;
} NET_LUID;
#endif
typedef DWORD (WINAPI *cigl_t)(const GUID *, NET_LUID *);
typedef DWORD (WINAPI *cilnA_t)(const NET_LUID *, char *, size_t);
static cigl_t pConvertInterfaceGuidToLuid = NULL;
static cilnA_t pConvertInterfaceLuidToNameA = NULL;
int int
getifaddrs(struct ifaddrs **ifap) getifaddrs(struct ifaddrs **ifap)
{ {
@ -3758,15 +3798,37 @@ getifaddrs(struct ifaddrs **ifap)
return -1; return -1;
} }
if (!pConvertInterfaceGuidToLuid)
pConvertInterfaceGuidToLuid =
(cigl_t)get_proc_address("iphlpapi.dll",
"ConvertInterfaceGuidToLuid", NULL);
if (!pConvertInterfaceLuidToNameA)
pConvertInterfaceLuidToNameA =
(cilnA_t)get_proc_address("iphlpapi.dll",
"ConvertInterfaceLuidToNameA", NULL);
for (prev = NULL, addr = root; addr; addr = addr->Next) { for (prev = NULL, addr = root; addr; addr = addr->Next) {
struct ifaddrs *ifa = ruby_xcalloc(1, sizeof(*ifa)); struct ifaddrs *ifa = ruby_xcalloc(1, sizeof(*ifa));
char name[IFNAMSIZ];
GUID guid;
NET_LUID luid;
if (prev) if (prev)
prev->ifa_next = ifa; prev->ifa_next = ifa;
else else
*ifap = ifa; *ifap = ifa;
ifa->ifa_name = ruby_xmalloc(lstrlen(addr->AdapterName) + 1); str2guid(addr->AdapterName, &guid);
lstrcpy(ifa->ifa_name, addr->AdapterName); if (pConvertInterfaceGuidToLuid && pConvertInterfaceLuidToNameA &&
pConvertInterfaceGuidToLuid(&guid, &luid) == NO_ERROR &&
pConvertInterfaceLuidToNameA(&luid, name, sizeof(name)) == NO_ERROR) {
ifa->ifa_name = ruby_xmalloc(lstrlen(name) + 1);
lstrcpy(ifa->ifa_name, name);
}
else {
ifa->ifa_name = ruby_xmalloc(lstrlen(addr->AdapterName) + 1);
lstrcpy(ifa->ifa_name, addr->AdapterName);
}
if (addr->IfType & IF_TYPE_SOFTWARE_LOOPBACK) if (addr->IfType & IF_TYPE_SOFTWARE_LOOPBACK)
ifa->ifa_flags |= IFF_LOOPBACK; ifa->ifa_flags |= IFF_LOOPBACK;
@ -3786,8 +3848,8 @@ getifaddrs(struct ifaddrs **ifap)
ifa = ruby_xcalloc(1, sizeof(*ifa)); ifa = ruby_xcalloc(1, sizeof(*ifa));
prev->ifa_next = ifa; prev->ifa_next = ifa;
ifa->ifa_name = ifa->ifa_name =
ruby_xmalloc(lstrlen(addr->AdapterName) + 1); ruby_xmalloc(lstrlen(prev->ifa_name) + 1);
lstrcpy(ifa->ifa_name, addr->AdapterName); lstrcpy(ifa->ifa_name, prev->ifa_name);
ifa->ifa_flags = prev->ifa_flags; ifa->ifa_flags = prev->ifa_flags;
} }
ifa->ifa_addr = ruby_xmalloc(cur->Address.iSockaddrLength); ifa->ifa_addr = ruby_xmalloc(cur->Address.iSockaddrLength);