niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not require table to contain address if interface is down (Fixes #55)

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-12-06 18:51:53 +01:00
parent 31cc166047
commit 3b69213f51
1 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/os/src/windows/os_platform_ifaddrs.c
View file

@ -58,6 +58,8 @@ getifaces(PIP_ADAPTER_ADDRESSES *ptr)
if (err == 0) { if (err == 0) {
*ptr = buf; *ptr = buf;
} else {
os_free(buf);
} }
return err; return err;
@ -146,56 +148,54 @@ copyaddr(
const PIP_ADAPTER_UNICAST_ADDRESS addr) const PIP_ADAPTER_UNICAST_ADDRESS addr)
{ {
int err = 0; int err = 0;
int eq = 0;
os_ifaddrs_t *ifa; os_ifaddrs_t *ifa;
DWORD i; struct sockaddr *sa;
struct sockaddr *sa = (struct sockaddr *)addr->Address.lpSockaddr; size_t sz;
size_t size;
assert(iface != NULL); assert(iface != NULL);
assert(addrtable != NULL); assert(addrtable != NULL);
assert(addr != NULL); assert(addr != NULL);
sa = (struct sockaddr *)addr->Address.lpSockaddr;
sz = (size_t)addr->Address.iSockaddrLength;
if ((ifa = os_calloc_s(1, sizeof(*ifa))) == NULL) { if ((ifa = os_calloc_s(1, sizeof(*ifa))) == NULL) {
err = ENOMEM; err = ENOMEM;
} else { } else {
ifa->flags = getflags(iface); ifa->flags = getflags(iface);
ifa->addr = os_memdup(sa, sz);
(void)os_asprintf(&ifa->name, "%wS", iface->FriendlyName); (void)os_asprintf(&ifa->name, "%wS", iface->FriendlyName);
if (ifa->addr == NULL || ifa->name == NULL) {
if (ifa->name == NULL) {
err = ENOMEM; err = ENOMEM;
} else { } else if (ifa->addr->sa_family == AF_INET6) {
ifa->addr = os_memdup(sa, addr->Address.iSockaddrLength); ifa->index = iface->Ipv6IfIndex;
if (ifa->addr == NULL) {
/* Address is not in addrtable if the interface is not connected. */
} else if (ifa->addr->sa_family == AF_INET && (ifa->flags & IFF_UP)) {
DWORD i = 0;
struct sockaddr_in nm, bc, *sin = (struct sockaddr_in *)sa;
assert(sz == sizeof(nm));
memset(&nm, 0, sz);
memset(&bc, 0, sz);
nm.sin_family = bc.sin_family = AF_INET;
for (; i < addrtable->dwNumEntries; i++) {
if (sin->sin_addr.s_addr == addrtable->table[i].dwAddr) {
ifa->index = addrtable->table[i].dwIndex;
nm.sin_addr.s_addr = addrtable->table[i].dwMask;
bc.sin_addr.s_addr =
sin->sin_addr.s_addr | ~(nm.sin_addr.s_addr);
break;
}
}
assert(i < addrtable->dwNumEntries);
if ((ifa->netmask = os_memdup(&nm, sz)) == NULL ||
(ifa->broadaddr = os_memdup(&bc, sz)) == NULL)
{
err = ENOMEM; err = ENOMEM;
} else if (ifa->addr->sa_family == AF_INET) {
size = sizeof(struct sockaddr_in);
struct sockaddr_in netmask, broadaddr;
memset(&netmask, 0, size);
memset(&broadaddr, 0, size);
netmask.sin_family = broadaddr.sin_family = AF_INET;
for (i = 0; !eq && i < addrtable->dwNumEntries; i++) {
eq = (((struct sockaddr_in *)sa)->sin_addr.s_addr ==
addrtable->table[i].dwAddr);
if (eq) {
ifa->index = addrtable->table[i].dwIndex;
netmask.sin_addr.s_addr = addrtable->table[i].dwMask;
broadaddr.sin_addr.s_addr =
((struct sockaddr_in *)sa)->sin_addr.s_addr | ~(netmask.sin_addr.s_addr);
}
}
assert(eq != 0);
if ((ifa->netmask = os_memdup(&netmask, size)) == NULL ||
(ifa->broadaddr = os_memdup(&broadaddr, size)) == NULL)
{
err = ENOMEM;
}
} else {
ifa->index = iface->Ipv6IfIndex;
} }
} }
} }
@ -203,7 +203,7 @@ copyaddr(
if (err == 0) { if (err == 0) {
*ifap = ifa; *ifap = ifa;
} else { } else {
os_free(ifa); os_freeifaddrs(ifa);
} }
return err; return err;