asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update miniupnpc to use UWP compatible APIs.

Browse source 
Use GetBestInterfaceEX and GetAdaptersAddresses instead of GetBestRoute
and GetIpAddrTable.
This commit is contained in:
Fabio Alessandrelli 2018-09-13 18:33:14 +02:00
parent 06c8b5a4ff
commit f961758fbe
1 changed files with 81 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
thirdparty/miniupnpc/minissdpc.c vendored
View file

@ -494,7 +494,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
struct addrinfo hints, *servinfo, *p; struct addrinfo hints, *servinfo, *p;
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
MIB_IPFORWARDROW ip_forward;
unsigned long _ttl = (unsigned long)ttl; unsigned long _ttl = (unsigned long)ttl;
#endif #endif
int linklocal = 1; int linklocal = 1;
@ -538,61 +537,103 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
* SSDP multicast traffic */ * SSDP multicast traffic */
/* Get IP associated with the index given in the ip_forward struct /* Get IP associated with the index given in the ip_forward struct
* in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */ * in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */
if(!ipv6 if(!ipv6) {
&& (GetBestRoute(inet_addr("223.255.255.255"), 0, &ip_forward) == NO_ERROR)) { DWORD ifbestidx;
DWORD dwRetVal = 0; SOCKADDR_IN destAddr;
PMIB_IPADDRTABLE pIPAddrTable; memset(&destAddr, 0, sizeof(destAddr));
DWORD dwSize = 0; destAddr.sin_family = AF_INET;
#ifdef DEBUG destAddr.sin_addr.s_addr = inet_addr("223.255.255.255");
IN_ADDR IPAddr; destAddr.sin_port = 0;
#endif if (GetBestInterfaceEx((struct sockaddr *)&destAddr, &ifbestidx) == NO_ERROR) {
int i; DWORD dwSize = 0;
#ifdef DEBUG DWORD dwRetVal = 0;
printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop); unsigned int i = 0;
#endif ULONG flags = GAA_FLAG_INCLUDE_PREFIX;
pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE)); ULONG family = AF_INET;
if(pIPAddrTable) { LPVOID lpMsgBuf = NULL;
if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { PIP_ADAPTER_ADDRESSES pAddresses = NULL;
free(pIPAddrTable); ULONG outBufLen = 0;
pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); ULONG Iterations = 0;
} PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
} PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
if(pIPAddrTable) { PIP_ADAPTER_ANYCAST_ADDRESS pAnycast = NULL;
dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 ); PIP_ADAPTER_MULTICAST_ADDRESS pMulticast = NULL;
IP_ADAPTER_DNS_SERVER_ADDRESS *pDnServer = NULL;
IP_ADAPTER_PREFIX *pPrefix = NULL;
outBufLen = 15360;
do {
pAddresses = (IP_ADAPTER_ADDRESSES *) HeapAlloc(GetProcessHeap(), 0, outBufLen);
if (pAddresses == NULL) {
break;
}
dwRetVal = GetAdaptersAddresses(family, flags, NULL, pAddresses, &outBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
HeapFree(GetProcessHeap(), 0, pAddresses);
pAddresses = NULL;
} else {
break;
}
Iterations++;
} while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (Iterations < 3));
if (dwRetVal == NO_ERROR) { if (dwRetVal == NO_ERROR) {
pCurrAddresses = pAddresses;
while (pCurrAddresses) {
#ifdef DEBUG #ifdef DEBUG
printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries); printf("\tIfIndex (IPv4 interface): %u\n", pCurrAddresses->IfIndex);
#endif printf("\tAdapter name: %s\n", pCurrAddresses->AdapterName);
for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) { pUnicast = pCurrAddresses->FirstUnicastAddress;
#ifdef DEBUG if (pUnicast != NULL) {
printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex); for (i = 0; pUnicast != NULL; i++) {
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr; IPAddr.S_un.S_addr = (u_long) pUnicast->Address;
printf("\tIP Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) ); printf("\tIP Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask; pUnicast = pUnicast->Next;
printf("\tSubnet Mask[%d]: \t%s\n", i, inet_ntoa(IPAddr) ); }
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr; printf("\tNumber of Unicast Addresses: %d\n", i);
printf("\tBroadCast[%d]: \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr); }
printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize); pAnycast = pCurrAddresses->FirstAnycastAddress;
printf("\tType and State[%d]:", i); if (pAnycast) {
for (i = 0; pAnycast != NULL; i++) {
IPAddr.S_un.S_addr = (u_long) pAnyCast->Address;
printf("\tAnycast Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
pAnycast = pAnycast->Next;
}
printf("\tNumber of Anycast Addresses: %d\n", i);
}
pMulticast = pCurrAddresses->FirstMulticastAddress;
if (pMulticast) {
for (i = 0; pMulticast != NULL; i++) {
IPAddr.S_un.S_addr = (u_long) pMultiCast->Address;
printf("\tMulticast Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
}
}
printf("\n"); printf("\n");
#endif #endif
if (pIPAddrTable->table[i].dwIndex == ip_forward.dwForwardIfIndex) { pUnicast = pCurrAddresses->FirstUnicastAddress;
if (pCurrAddresses->IfIndex == ifbestidx && pUnicast != NULL) {
SOCKADDR_IN *ipv4 = (SOCKADDR_IN *)(pUnicast->Address.lpSockaddr);
/* Set the address of this interface to be used */ /* Set the address of this interface to be used */
struct in_addr mc_if; struct in_addr mc_if;
memset(&mc_if, 0, sizeof(mc_if)); memset(&mc_if, 0, sizeof(mc_if));
mc_if.s_addr = pIPAddrTable->table[i].dwAddr; mc_if.s_addr = ipv4->sin_addr.s_addr;
if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) { if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) {
PRINT_SOCKET_ERROR("setsockopt"); PRINT_SOCKET_ERROR("setsockopt");
} }
((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = pIPAddrTable->table[i].dwAddr; ((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = ipv4->sin_addr.s_addr;
#ifndef DEBUG #ifndef DEBUG
break; break;
#endif #endif
} }
pCurrAddresses = pCurrAddresses->Next;
} }
} }
free(pIPAddrTable); if (pAddresses != NULL) {
pIPAddrTable = NULL; HeapFree(GetProcessHeap(), 0, pAddresses);
pAddresses = NULL;
}
} }
} }
#endif /* _WIN32 */ #endif /* _WIN32 */