ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iphlpapi: Implement ParseNetworkString for IPv6 addresses and services. 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2020-05-13 08:52:54 -06:00 committed by Alexandre Julliard
parent 474d1f0b2d
commit 40cc236b6b
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/iphlpapi/iphlpapi_main.c
View File

@ -3415,6 +3415,8 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type,
NET_ADDRESS_INFO *info, USHORT *port, BYTE *prefix_len) NET_ADDRESS_INFO *info, USHORT *port, BYTE *prefix_len)
{ {
IN_ADDR temp_addr4; IN_ADDR temp_addr4;
IN6_ADDR temp_addr6;
ULONG temp_scope;
USHORT temp_port = 0; USHORT temp_port = 0;
NTSTATUS status; NTSTATUS status;
@ -3455,10 +3457,44 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
} }
if (type & NET_STRING_IPV6_ADDRESS)
{
status = RtlIpv6StringToAddressExW(str, &temp_addr6, &temp_scope, &temp_port);
if (SUCCEEDED(status) && !temp_port)
{
if (info)
{
info->Format = NET_ADDRESS_IPV6;
info->u.Ipv6Address.sin6_addr = temp_addr6;
info->u.Ipv6Address.sin6_scope_id = temp_scope;
info->u.Ipv6Address.sin6_port = 0;
}
if (port) *port = 0;
if (prefix_len) *prefix_len = 255;
return ERROR_SUCCESS;
}
}
if (type & NET_STRING_IPV6_SERVICE)
{
status = RtlIpv6StringToAddressExW(str, &temp_addr6, &temp_scope, &temp_port);
if (SUCCEEDED(status) && temp_port)
{
if (info)
{
info->Format = NET_ADDRESS_IPV6;
info->u.Ipv6Address.sin6_addr = temp_addr6;
info->u.Ipv6Address.sin6_scope_id = temp_scope;
info->u.Ipv6Address.sin6_port = temp_port;
}
if (port) *port = ntohs(temp_port);
if (prefix_len) *prefix_len = 255;
return ERROR_SUCCESS;
}
}
if (info) info->Format = NET_ADDRESS_FORMAT_UNSPECIFIED; if (info) info->Format = NET_ADDRESS_FORMAT_UNSPECIFIED;
if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE)) if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_ADDRESS|NET_STRING_IPV6_SERVICE))
{ {
FIXME("Unimplemented type 0x%x\n", type); FIXME("Unimplemented type 0x%x\n", type);
return ERROR_NOT_SUPPORTED; return ERROR_NOT_SUPPORTED;