From 09d90b02fb0e79479624647f16dc8740a58a0111 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Fri, 1 Feb 2019 23:02:12 -0800
Subject: [PATCH] Remove prints and unecessary items from windows
 GetNetworkInterfaces (#1573)

---
 .../src/main/native/windows/NetworkUtil.cpp   | 77 -------------------
 1 file changed, 77 deletions(-)

diff --git a/cscore/src/main/native/windows/NetworkUtil.cpp b/cscore/src/main/native/windows/NetworkUtil.cpp
index 99e734a3ca..e994eb8ff0 100644
--- a/cscore/src/main/native/windows/NetworkUtil.cpp
+++ b/cscore/src/main/native/windows/NetworkUtil.cpp
@@ -5,27 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include <winsock2.h>  // NOLINT(build/include_order)
-
-#include <iphlpapi.h>  // NOLINT(build/include_order)
-
-#include <ws2tcpip.h>  // NOLINT(build/include_order)
-
 #include <uv.h>
 
-#include <iostream>
-
 #include "cscore_cpp.h"
 
-#pragma comment(lib, "IPHLPAPI.lib")
 #pragma comment(lib, "Ws2_32.lib")
 
-#define WORKING_BUFFER_SIZE 15000
-#define MAX_TRIES 3
-
-#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
-#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
-
 namespace cs {
 
 std::vector<std::string> GetNetworkInterfaces() {
@@ -40,80 +25,18 @@ std::vector<std::string> GetNetworkInterfaces() {
 
   for (int i = 0; i < counts; i++) {
     if (adrs[i].is_internal) continue;
-    std::cout << adrs[i].name << std::endl;
     InetNtop(PF_INET, &(adrs[i].netmask.netmask4.sin_addr.s_addr), ip,
              sizeof(ip) - 1);
     ip[49] = '\0';
-    std::cout << ip << std::endl;
     InetNtop(PF_INET, &(adrs[i].address.address4.sin_addr.s_addr), ip,
              sizeof(ip) - 1);
     ip[49] = '\0';
-    std::cout << ip << std::endl;
     addresses.emplace_back(std::string{ip});
   }
 
   uv_free_interface_addresses(adrs, counts);
 
-  std::cout << "finished\n";
-
   return addresses;
-
-  PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-  PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
-  PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
-  PIP_ADAPTER_ANYCAST_ADDRESS pAnycast = NULL;
-  PIP_ADAPTER_MULTICAST_ADDRESS pMulticast = NULL;
-  unsigned int i = 0;
-
-  ULONG outBufLen = 0;
-  ULONG Iterations = 0;
-  DWORD dwRetVal = 0;
-
-  // Allocate a 15 KB buffer to start with.
-  outBufLen = WORKING_BUFFER_SIZE;
-
-  do {
-    pAddresses = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(MALLOC(outBufLen));
-    if (pAddresses == NULL) {
-      std::printf("Memory allocation failed for IP_ADAPTER_ADDRESSES struct\n");
-      std::exit(1);
-    }
-
-    dwRetVal = GetAdaptersAddresses(AF_INET, GAA_FLAG_INCLUDE_PREFIX, NULL,
-                                    pAddresses, &outBufLen);
-
-    if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
-      FREE(pAddresses);
-      pAddresses = NULL;
-    } else {
-      break;
-    }
-
-    Iterations++;
-  } while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (Iterations < MAX_TRIES));
-
-  if (dwRetVal == NO_ERROR) {
-    pCurrAddresses = pAddresses;
-    while (pCurrAddresses) {
-      pUnicast = pCurrAddresses->FirstUnicastAddress;
-      while (pUnicast != NULL) {
-        sockaddr_in* address =
-            reinterpret_cast<sockaddr_in*>(pUnicast->Address.lpSockaddr);
-        InetNtop(PF_INET, &(address->sin_addr.s_addr), ip, sizeof(ip) - 1);
-        ip[49] = '\0';
-        addresses.emplace_back(std::string{ip});
-        pUnicast = pUnicast->Next;
-      }
-
-      pCurrAddresses = pCurrAddresses->Next;
-    }
-  }
-
-  if (pAddresses) {
-    FREE(pAddresses);
-  }
-
-  return addresses;  // TODO
 }
 
 }  // namespace cs