[IPCONFIG] Revert changes that were not meant to be published yet

base/applications/network/ipconfig/ipconfig.c

@@ -34,59 +34,6 @@
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
 
-BOOL
-DoNamesMatch(
-    _In_ LPWSTR pszName,
-    _In_ LPTSTR pszPattern)
-{
-    if (pszPattern == NULL)
-        return TRUE;
-
-//    if (_wcsicmp(pszName, pszPattern) == 0)
-//        return TRUE;
-#if 0
-    for (;;)
-    {
-        if (*pszPattern == L'*')
-        {
-            pszPattern++;
-            if (*pszPattern == L'\0')
-                return TRUE;
-
-            while (towlower(*pszName) != towlower(*pszPattern))
-            {
-                if (*pszName == L'\0')
-                    return FALSE;
-
-                pszName++;
-            }
-        }
-        else if (*pszPattern == L'?')
-        {
-            pszPattern++;
-
-            if (*pszName == L'\0')
-                return FALSE;
-
-            pszName++;
-        }
-        else
-        {
-            if (*pszName == L'\0' && *pszPattern == L'\0')
-                return TRUE;
-
-            if (towlower(*pszName) != towlower(*pszPattern))
-                return FALSE;
-
-            pszName++;
-            pszPattern++;
-        }
-    }
-#endif
-
-    return FALSE;
-}
-
 int LoadStringAndOem(HINSTANCE hInst,
                      UINT uID,
                      LPTSTR szNode,
@@ -660,6 +607,10 @@ VOID Release(LPTSTR Index)
     IP_ADAPTER_INDEX_MAP AdapterInfo;
     DWORD ret;
     DWORD i;
+
+    /* if interface is not given, query GetInterfaceInfo */
+    if (Index == NULL)
+    {
         PIP_INTERFACE_INFO pInfo = NULL;
         ULONG ulOutBufLen = 0;
 
@@ -672,8 +623,6 @@ VOID Release(LPTSTR Index)
             if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR )
             {
                 for (i = 0; i < pInfo->NumAdapters; i++)
-            {
-                if (DoNamesMatch(pInfo->Adapter[i].Name, Index))
                 {
                     CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP));
                     _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name);
@@ -685,7 +634,6 @@ VOID Release(LPTSTR Index)
                         DoFormatMessage(ret);
                     }
                 }
-            }
 
                 HeapFree(ProcessHeap, 0, pInfo);
             }
@@ -701,14 +649,31 @@ VOID Release(LPTSTR Index)
             DoFormatMessage(0);
             return;
         }
+    }
+    else
+    {
+        ;
+        /* FIXME:
+         * we need to be able to release connections by name with support for globbing
+         * i.e. ipconfig /release Eth* will release all cards starting with Eth...
+         *      ipconfig /release *con* will release all cards with 'con' in their name
+         */
+    }
 }
 
+
+
+
 VOID Renew(LPTSTR Index)
 {
     IP_ADAPTER_INDEX_MAP AdapterInfo;
+    DWORD i;
+
+    /* if interface is not given, query GetInterfaceInfo */
+    if (Index == NULL)
+    {
         PIP_INTERFACE_INFO pInfo;
         ULONG ulOutBufLen = 0;
-    DWORD i;
 
         pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO));
         if (pInfo == NULL)
@@ -734,8 +699,6 @@ VOID Renew(LPTSTR Index)
         if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR)
         {
             for (i = 0; i < pInfo->NumAdapters; i++)
-        {
-            if (DoNamesMatch(pInfo->Adapter[i].Name, Index))
             {
                 CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP));
                 _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name);
@@ -748,7 +711,6 @@ VOID Renew(LPTSTR Index)
                 }
             }
         }
-    }
         else
         {
             _tprintf(_T("\nGetInterfaceInfo failed : "));
@@ -756,6 +718,16 @@ VOID Renew(LPTSTR Index)
         }
 
         HeapFree(ProcessHeap, 0, pInfo);
+    }
+    else
+    {
+        ;
+        /* FIXME:
+         * we need to be able to renew connections by name with support for globbing
+         * i.e. ipconfig /renew Eth* will renew all cards starting with Eth...
+         *      ipconfig /renew *con* will renew all cards with 'con' in their name
+         */
+    }
 }
 
 VOID
@@ -1018,9 +990,10 @@ int main(int argc, char *argv[])
             break;
         case 3: /* Process all the options that can have 1 parameter */
             if (DoRelease)
-                Release(argv[2]);
+                _tprintf(_T("\nSorry /release [adapter] is not implemented yet\n"));
+                //Release(argv[2]);
             else if (DoRenew)
-                Renew(argv[2]);
+                _tprintf(_T("\nSorry /renew [adapter] is not implemented yet\n"));
             else if (DoShowclassid)
                 _tprintf(_T("\nSorry /showclassid adapter is not implemented yet\n"));
             else if (DoSetclassid)