ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode.

6ceb5644 · Vitaly Lipatov · Alexandre Julliard · 89bdb2f4 · 6ceb5644
Commit 6ceb5644 authored Nov 18, 2013 by Vitaly Lipatov Committed by Alexandre Julliard Nov 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ipconfig.c programs/ipconfig/ipconfig.c +5 -1

No files found.
--- a/programs/ipconfig/ipconfig.c
+++ b/programs/ipconfig/ipconfig.c
@@ -186,8 +186,12 @@ static void print_basic_information(void)

                for (addr = p->FirstUnicastAddress; addr; addr = addr->Next)
                {
-                    if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address))
+                    if (addr->Address.lpSockaddr->sa_family == AF_INET &&
+                        socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address))
                        print_field(STRING_IP_ADDRESS, addr_buf);
+                    else if (addr->Address.lpSockaddr->sa_family == AF_INET6 &&
+                             socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address))
+                        print_field(STRING_IP6_ADDRESS, addr_buf);
                    /* FIXME: Output corresponding subnet mask. */
                }