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

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 47913a59a9880b2cf87b82a442947091a1fe0847
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47913a59a9880b2cf87b82a442...

Author: Vitaly Lipatov <lav(a)etersoft.ru>
Date:   Mon Nov 18 19:00:10 2013 +0400

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

(cherry picked from commit 6ceb5644083bee2f26c87634dfc3ba86e771a01e)

---

 programs/ipconfig/ipconfig.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c
index 30e50fd..11ff56b 100644
--- 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. */
                 }