Fix wintun - connects but errors

This commit is contained in:
2025-12-18 11:12:11 +01:00
parent 225aa2a55d
commit 17cc314c26
2 changed files with 10 additions and 3 deletions

View File

@@ -33,6 +33,8 @@
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <locale>
#include <codecvt>
#include <wintun/wintun.h> #include <wintun/wintun.h>
#endif #endif

View File

@@ -113,20 +113,25 @@ namespace ColumnLynx::Net {
#elif defined(_WIN32) #elif defined(_WIN32)
// Convert to Windows' wchar_t* thingy
std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
std::wstring wide_string = converter.from_bytes(mIfName);
const wchar_t* wide_c_str = wide_string.c_str();
InitializeWintun(); InitializeWintun();
mAdapter = pWintunOpenAdapter(ifaceName); mAdapter = pWintunOpenAdapter(wide_c_str);
if (!mAdapter) { if (!mAdapter) {
mAdapter = pWintunCreateAdapter( mAdapter = pWintunCreateAdapter(
ifaceName, wide_c_str,
L"ColumnLynx", L"ColumnLynx",
nullptr nullptr
); );
} }
if (!mAdapter) if (!mAdapter)
throw std::runtime_error("Failed to open or create Wintun adapter"); throw std::runtime_error("Failed to open or create Wintun adapter (run running as admin)");
mSession = pWintunStartSession(mAdapter, 0x200000); mSession = pWintunStartSession(mAdapter, 0x200000);
if (!mSession) if (!mSession)