ipconfig: Partially implement full adapter information output.

diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc
index 7eeffdffc7848dc16415fa322a84a23cd7d5fffd..73f112c54af0bca41aa604d0558930d8fb70b305 100644 (file)
--- a/programs/ipconfig/En.rc
+++ b/programs/ipconfig/En.rc
@@ -32,4 +32,14 @@ STRINGTABLE
     STRING_UNKNOWN, "Unknown"
     STRING_CONN_DNS_SUFFIX, "Connection-specific DNS suffix"
     STRING_IP_ADDRESS, "IP address"
+    STRING_HOSTNAME, "Hostname"
+    STRING_NODE_TYPE, "Node type"
+    STRING_BROADCAST, "Broadcast"
+    STRING_PEER_TO_PEER, "Peer-to-peer"
+    STRING_MIXED, "Mixed"
+    STRING_HYBRID, "Hybrid"
+    STRING_IP_ROUTING, "IP routing enabled"
+    STRING_DESCRIPTION, "Description"
+    STRING_PHYS_ADDR, "Physical address"
+    STRING_DHCP_ENABLED, "DHCP enabled"
 }

diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c
index 89ea8a4e22d085827ed397f91c64bb1ad9f1f17f..ccaa78c8407d883d85be9619c4eed5d55678f1f8 100644 (file)
--- a/programs/ipconfig/ipconfig.c
+++ b/programs/ipconfig/ipconfig.c
@@ -179,6 +179,141 @@ static void print_basic_information(void)
     }
 }
 
+static const WCHAR *nodetype_to_string(DWORD type)
+{
+    static WCHAR msg_buffer[50];
+
+    int msg;
+
+    switch (type)
+    {
+    case BROADCAST_NODETYPE:
+        msg = STRING_BROADCAST;
+        break;
+    case PEER_TO_PEER_NODETYPE:
+        msg = STRING_PEER_TO_PEER;
+        break;
+    case MIXED_NODETYPE:
+        msg = STRING_MIXED;
+        break;
+    case HYBRID_NODETYPE:
+        msg = STRING_HYBRID;
+        break;
+    default:
+        msg = STRING_UNKNOWN;
+    }
+
+    LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer,
+        sizeof(msg_buffer)/sizeof(WCHAR));
+
+    return msg_buffer;
+}
+
+static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len)
+{
+    static const WCHAR fmtW[] = {'%','0','2','X','-',0};
+    static const WCHAR fmt2W[] = {'%','0','2','X',0};
+
+    if (!len)
+        *buf = '\0';
+    else
+    {
+        WCHAR *p = buf;
+        DWORD i;
+
+        for (i = 0; i < len - 1; i++)
+        {
+            sprintfW(p, fmtW, addr[i]);
+            p += 3;
+        }
+        sprintfW(p, fmt2W, addr[i]);
+    }
+
+    return buf;
+}
+
+static void print_full_information(void)
+{
+    static const WCHAR yesW[] = {'Y','e','s',0};
+    static const WCHAR noW[] = {'N','o',0};
+    static const WCHAR newlineW[] = {'\n',0};
+
+    FIXED_INFO *info;
+    IP_ADAPTER_ADDRESSES *adapters;
+    ULONG out = 0;
+
+    if (GetNetworkParams(NULL, &out) == ERROR_BUFFER_OVERFLOW)
+    {
+        info = HeapAlloc(GetProcessHeap(), 0, out);
+        if (!info)
+            exit(1);
+
+        if (GetNetworkParams(info, &out) == ERROR_SUCCESS)
+        {
+            WCHAR hostnameW[MAX_HOSTNAME_LEN + 4];
+
+            MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, sizeof(hostnameW));
+            print_field(STRING_HOSTNAME, hostnameW);
+
+            /* FIXME: Output primary DNS suffix. */
+
+            print_field(STRING_NODE_TYPE, nodetype_to_string(info->NodeType));
+            print_field(STRING_IP_ROUTING, info->EnableRouting ? yesW : noW);
+
+            /* FIXME: Output WINS proxy status and DNS suffix search list. */
+
+            ipconfig_printfW(newlineW);
+        }
+
+        HeapFree(GetProcessHeap(), 0, info);
+    }
+
+    if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW)
+    {
+        adapters = HeapAlloc(GetProcessHeap(), 0, out);
+        if (!adapters)
+            exit(1);
+
+        if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS)
+        {
+            IP_ADAPTER_ADDRESSES *p;
+
+            for (p = adapters; p; p = p->Next)
+            {
+                IP_ADAPTER_UNICAST_ADDRESS *addr;
+                WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH];
+
+                ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName);
+                ipconfig_printfW(newlineW);
+                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, (p->Flags & IP_ADAPTER_DHCP_ENABLED) ? yesW : noW);
+
+                /* FIXME: Output autoconfiguration status. */
+
+                for (addr = p->FirstUnicastAddress; addr; addr = addr->Next)
+                {
+                    WCHAR addr_buf[54];
+                    DWORD len = sizeof(addr_buf)/sizeof(WCHAR);
+
+                    if (WSAAddressToStringW(addr->Address.lpSockaddr,
+                                            addr->Address.iSockaddrLength, NULL,
+                                            addr_buf, &len) == 0)
+                        print_field(STRING_IP_ADDRESS, addr_buf);
+                    /* FIXME: Output corresponding subnet mask. */
+                }
+
+                /* FIXME: Output default gateway address. */
+
+                ipconfig_printfW(newlineW);
+            }
+        }
+
+        HeapFree(GetProcessHeap(), 0, adapters);
+    }
+}
+
 int wmain(int argc, WCHAR *argv[])
 {
     static const WCHAR slashHelp[] = {'/','?',0};
@@ -207,7 +342,7 @@ int wmain(int argc, WCHAR *argv[])
                 return 1;
             }
 
-            WINE_FIXME("/all option is not currently handled\n");
+            print_full_information();
         }
         else
         {

diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h
index e555b871912f028c214931fe0ce3aa4e1c1b2013..4f9325baea186e5e13d50ce598f908a9c63c9d23 100644 (file)
--- a/programs/ipconfig/ipconfig.h
+++ b/programs/ipconfig/ipconfig.h
@@ -28,3 +28,13 @@
 #define STRING_UNKNOWN          105
 #define STRING_CONN_DNS_SUFFIX  106
 #define STRING_IP_ADDRESS       107
+#define STRING_HOSTNAME         108
+#define STRING_NODE_TYPE        109
+#define STRING_BROADCAST        110
+#define STRING_PEER_TO_PEER     111
+#define STRING_MIXED            112
+#define STRING_HYBRID           113
+#define STRING_IP_ROUTING       114
+#define STRING_DESCRIPTION      115
+#define STRING_PHYS_ADDR        116
+#define STRING_DHCP_ENABLED     117