Merge branch 'win-remove-dead-code'

6 files changed, 0 insertions, 140 deletions

diff --git a/windows/libshared/src/libshared/libshared.vcxproj b/windows/libshared/src/libshared/libshared.vcxproj
index 88a2ac5140..b357524acc 100644
--- a/windows/libshared/src/libshared/libshared.vcxproj
+++ b/windows/libshared/src/libshared/libshared.vcxproj
@@ -176,7 +176,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="network\interfaceutils.h" />
     <ClInclude Include="logging\logsink.h" />
     <ClInclude Include="logging\logsinkadapter.h" />
     <ClInclude Include="logging\stdoutlogger.h" />
@@ -185,7 +184,6 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="network\interfaceutils.cpp" />
     <ClCompile Include="logging\logsinkadapter.cpp" />
     <ClCompile Include="logging\stdoutlogger.cpp" />
     <ClCompile Include="logging\unwind.cpp" />
diff --git a/windows/libshared/src/libshared/libshared.vcxproj.filters b/windows/libshared/src/libshared/libshared.vcxproj.filters
index ef4f0330d2..bbb979bc4a 100644
--- a/windows/libshared/src/libshared/libshared.vcxproj.filters
+++ b/windows/libshared/src/libshared/libshared.vcxproj.filters
@@ -15,9 +15,6 @@
     <ClInclude Include="logging\unwind.h">
       <Filter>logging</Filter>
     </ClInclude>
-    <ClInclude Include="network\interfaceutils.h">
-      <Filter>network</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />
@@ -30,16 +27,10 @@
     <ClCompile Include="logging\unwind.cpp">
       <Filter>logging</Filter>
     </ClCompile>
-    <ClCompile Include="network\interfaceutils.cpp">
-      <Filter>network</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="logging">
       <UniqueIdentifier>{8d3be7e9-117c-44d3-a799-0bc6e2712776}</UniqueIdentifier>
     </Filter>
-    <Filter Include="network">
-      <UniqueIdentifier>{c36884fc-7afc-42a8-b852-c0aafcfcc1c2}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/libshared/src/libshared/network/interfaceutils.cpp b/windows/libshared/src/libshared/network/interfaceutils.cpp
deleted file mode 100644
index fcfcb47a0e..0000000000
--- a/windows/libshared/src/libshared/network/interfaceutils.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "stdafx.h"
-#include <sstream>
-#include <algorithm>
-#include "interfaceutils.h"
-#include <libcommon/error.h>
-#include <libcommon/string.h>
-
-namespace shared::network
-{
-
-InterfaceUtils::NetworkAdapter::NetworkAdapter(
-	const std::shared_ptr<std::vector<uint8_t>> addressesBuffer,
-	const IP_ADAPTER_ADDRESSES &entry
-)
-	: m_addressesBuffer(addressesBuffer)
-	, m_entry(entry)
-{
-	m_guid = common::string::ToWide(entry.AdapterName);
-	m_alias = entry.FriendlyName;
-	m_name = entry.Description;
-}
-
-//static
-std::set<InterfaceUtils::NetworkAdapter> InterfaceUtils::GetAllAdapters(ULONG family, ULONG flags)
-{
-	ULONG bufferSize = 0;
-
-	auto status = GetAdaptersAddresses(family, flags, nullptr, nullptr, &bufferSize);
-
-	if (ERROR_BUFFER_OVERFLOW != status)
-	{
-		THROW_WINDOWS_ERROR(status, "Probe for adapter listing buffer size");
-	}
-
-	// Memory is cheap, this avoids a looping construct.
-	bufferSize *= 2;
-
-	auto buffer = std::make_shared<std::vector<uint8_t>>(bufferSize);
-	auto addresses = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(&(*buffer)[0]);
-
-	status = GetAdaptersAddresses(family, flags, nullptr, addresses, &bufferSize);
-
-	if (ERROR_SUCCESS != status)
-	{
-		THROW_WINDOWS_ERROR(status, "Retrieve adapter listing");
-	}
-
-	std::set<NetworkAdapter> adapters;
-
-	for (auto it = addresses; nullptr != it; it = it->Next)
-	{
-		adapters.emplace(NetworkAdapter(buffer, *it));
-	}
-
-	return adapters;
-}
-
-}
diff --git a/windows/libshared/src/libshared/network/interfaceutils.h b/windows/libshared/src/libshared/network/interfaceutils.h
deleted file mode 100644
index 1ab637eaf6..0000000000
--- a/windows/libshared/src/libshared/network/interfaceutils.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-
-#include <string>
-#include <set>
-#include <vector>
-#include <memory>
-#include <cstdint>
-
-// Secret include order to get most common networking structs/apis
-// And avoiding compilation errors
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2def.h>
-#include <ws2ipdef.h>
-#include <iphlpapi.h>
-#include <netioapi.h>
-// end
-
-namespace shared::network
-{
-
-class InterfaceUtils
-{
-	InterfaceUtils() = delete;
-
-public:
-
-	class NetworkAdapter
-	{
-
-	public:
-
-		const std::wstring &guid() const { return m_guid; }
-		const std::wstring &name() const { return m_name; }
-		const std::wstring &alias() const { return m_alias; }
-
-		bool operator<(const NetworkAdapter &rhs) const
-		{
-			return _wcsicmp(m_guid.c_str(), rhs.m_guid.c_str()) < 0;
-		}
-
-		const IP_ADAPTER_ADDRESSES &raw() const
-		{
-			return m_entry;
-		}
-
-	private:
-
-		NetworkAdapter(
-			const std::shared_ptr<std::vector<uint8_t>> addressesBuffer,
-			const IP_ADAPTER_ADDRESSES &entry
-		);
-
-		friend class InterfaceUtils;
-
-		const IP_ADAPTER_ADDRESSES &m_entry;
-		std::shared_ptr<std::vector<uint8_t>> m_addressesBuffer;
-
-		std::wstring m_guid;
-		std::wstring m_name;
-		std::wstring m_alias;
-	};
-
-	static std::set<NetworkAdapter> GetAllAdapters(ULONG family, ULONG flags);
-};
-
-}
diff --git a/windows/windows-libraries b/windows/windows-libraries
-Subproject bf7c8c924a3ac429518ad360b2ce17f03a068a7
+Subproject cb2d01dd7ff81a308bc489bb23bffa1a6ee7d9e
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index aae9f0f44e..99ff24a351 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -4,20 +4,16 @@
 #include "converters.h"

 #include <libshared/logging/logsinkadapter.h>

 #include <libshared/logging/unwind.h>

-#include <libshared/network/interfaceutils.h>

 #include <libcommon/error.h>

 #include <libcommon/memory.h>

 #include <libcommon/valuemapper.h>

-#include <libcommon/network.h>

 #include <cstdint>

 #include <memory>

 #include <optional>

 #include <mutex>

 

 using namespace winnet::routing;

-using namespace common::network;

 using AutoLockType = std::scoped_lock<std::mutex>;

-using namespace shared::network;

 

 namespace

 {