[PATCH 0/2] MR3741: ipconfig: Call GetAdaptersAddresses() in a loop.

List overview All Threads

newer

older

[PATCH v5 0/3] MR3312:...

[PATCH 0/8] MR3740: dmusic: Begin...

Hans Leidekker (＠hans)

6 Sep 2023 6 Sep '23

8:19 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3741

Show replies by date

Hans Leidekker

6 Sep 6 Sep

8:19 a.m.

New subject: [PATCH 1/2] ipconfig: Use CRT allocation functions.

From: Hans Leidekker hans@codeweavers.com

--- programs/ipconfig/ipconfig.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index f59c3ab7182..7c5671f9e1c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -45,13 +45,13 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) */ len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len); + msgA = malloc(len); if (!msgA) return 0;

WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + free(msgA); }

return count; @@ -146,7 +146,7 @@ static void print_basic_information(void) if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { - adapters = HeapAlloc(GetProcessHeap(), 0, out); + adapters = malloc(out); if (!adapters) exit(1);

@@ -194,7 +194,7 @@ static void print_basic_information(void) } }

- HeapFree(GetProcessHeap(), 0, adapters); + free(adapters); } }

@@ -265,7 +265,7 @@ static void print_full_information(void)

if (GetNetworkParams(NULL, &out) == ERROR_BUFFER_OVERFLOW) { - info = HeapAlloc(GetProcessHeap(), 0, out); + info = malloc(out); if (!info) exit(1);

@@ -288,13 +288,13 @@ static void print_full_information(void) ipconfig_printfW(L"\n"); }

- HeapFree(GetProcessHeap(), 0, info); + free(info); }

if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { - adapters = HeapAlloc(GetProcessHeap(), 0, out); + adapters = malloc(out); if (!adapters) exit(1);

@@ -348,7 +348,7 @@ static void print_full_information(void) } }

- HeapFree(GetProcessHeap(), 0, adapters); + free(adapters); } }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3741

Hans Leidekker

8:19 a.m.

New subject: [PATCH 2/2] ipconfig: Call GetAdaptersAddresses() in a loop.

From: Hans Leidekker hans@codeweavers.com

--- programs/ipconfig/ipconfig.c | 190 +++++++++++++++++------------------ 1 file changed, 92 insertions(+), 98 deletions(-)

diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 7c5671f9e1c..4d3cd5c5149 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -138,64 +138,70 @@ static BOOL socket_address_to_string(WCHAR *buf, DWORD len, SOCKET_ADDRESS *addr buf, &len) == 0; }

+static IP_ADAPTER_ADDRESSES *get_adapters(void) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static void print_basic_information(void) { - IP_ADAPTER_ADDRESSES *adapters; - ULONG out = 0; + IP_ADAPTER_ADDRESSES *adapters, *p;

- if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, - NULL, adapters, &out) == ERROR_SUCCESS) + for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - IP_ADAPTER_ADDRESSES *p; + if (addr->Address.lpSockaddr->sa_family == AF_INET && + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) + print_field(STRING_IP_ADDRESS, addr_buf); + else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) + print_field(STRING_IP6_ADDRESS, addr_buf); + /* FIXME: Output corresponding subnet mask. */ + }

- for (p = adapters; p; p = p->Next) + if (p->FirstGatewayAddress) + { + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) + print_field(STRING_DEFAULT_GATEWAY, addr_buf); + + for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) { - IP_ADAPTER_UNICAST_ADDRESS *addr; - IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; - WCHAR addr_buf[54]; - - ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(L"\n"); - print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); - - for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) - { - if (addr->Address.lpSockaddr->sa_family == AF_INET && - socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) - print_field(STRING_IP_ADDRESS, addr_buf); - else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && - socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) - print_field(STRING_IP6_ADDRESS, addr_buf); - /* FIXME: Output corresponding subnet mask. */ - } - - if (p->FirstGatewayAddress) - { - if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) - print_field(STRING_DEFAULT_GATEWAY, addr_buf); - - for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) - { - if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) - print_value(addr_buf); - } - } - else - print_field(STRING_DEFAULT_GATEWAY, L""); - - ipconfig_printfW(L"\n"); + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) + print_value(addr_buf); } } + else + print_field(STRING_DEFAULT_GATEWAY, L"");

- free(adapters); + ipconfig_printfW(L"\n"); } + free(adapters); }

static const WCHAR *nodetype_to_string(DWORD type) @@ -260,8 +266,8 @@ static const WCHAR *boolean_to_string(int value) static void print_full_information(void) { FIXED_INFO *info; - IP_ADAPTER_ADDRESSES *adapters; - ULONG out = 0; + IP_ADAPTER_ADDRESSES *adapters, *p; + ULONG out;

if (GetNetworkParams(NULL, &out) == ERROR_BUFFER_OVERFLOW) { @@ -291,65 +297,53 @@ static void print_full_information(void) free(info); }

- if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, - NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + adapters = get_adapters(); + if (!adapters) + exit(1); + + for (p = adapters; p; p = p->Next) { - adapters = malloc(out); - if (!adapters) - exit(1); + IP_ADAPTER_UNICAST_ADDRESS *addr; + WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH], addr_buf[54]; + IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; + + ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); + ipconfig_printfW(L"\n"); + print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); + print_field(STRING_DESCRIPTION, p->Description); + print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); + print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED));

- if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, - NULL, adapters, &out) == ERROR_SUCCESS) + /* FIXME: Output autoconfiguration status. */ + + for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - IP_ADAPTER_ADDRESSES *p; + if (addr->Address.lpSockaddr->sa_family == AF_INET && + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) + print_field(STRING_IP_ADDRESS, addr_buf); + else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && + socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) + print_field(STRING_IP6_ADDRESS, addr_buf); + /* FIXME: Output corresponding subnet mask. */ + }

- for (p = adapters; p; p = p->Next) + if (p->FirstGatewayAddress) + { + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) + print_field(STRING_DEFAULT_GATEWAY, addr_buf); + + for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) { - IP_ADAPTER_UNICAST_ADDRESS *addr; - WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH]; - IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; - WCHAR addr_buf[54]; - - ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(L"\n"); - print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); - print_field(STRING_DESCRIPTION, p->Description); - print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); - print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED)); - - /* FIXME: Output autoconfiguration status. */ - - for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) - { - if (addr->Address.lpSockaddr->sa_family == AF_INET && - socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) - print_field(STRING_IP_ADDRESS, addr_buf); - else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && - socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &addr->Address)) - print_field(STRING_IP6_ADDRESS, addr_buf); - /* FIXME: Output corresponding subnet mask. */ - } - - if (p->FirstGatewayAddress) - { - if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &p->FirstGatewayAddress->Address)) - print_field(STRING_DEFAULT_GATEWAY, addr_buf); - - for (gateway = p->FirstGatewayAddress->Next; gateway; gateway = gateway->Next) - { - if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) - print_value(addr_buf); - } - } - else - print_field(STRING_DEFAULT_GATEWAY, L""); - - ipconfig_printfW(L"\n"); + if (socket_address_to_string(addr_buf, ARRAY_SIZE(addr_buf), &gateway->Address)) + print_value(addr_buf); } } + else + print_field(STRING_DEFAULT_GATEWAY, L"");

- free(adapters); + ipconfig_printfW(L"\n"); } + free(adapters); }

int __cdecl wmain(int argc, WCHAR *argv[])

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3741

524

Age (days ago)

524

Last active (days ago)

wine-gitlab@winehq.org

2 comments

2 participants

tags (0)

participants (2)

Hans Leidekker
Hans Leidekker (＠hans)