diff options
| -rw-r--r-- | windows/winfw/src/winfw/winfw.cpp | 44 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/winfw.h | 15 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/winfw.vcxproj | 8 |
3 files changed, 33 insertions, 34 deletions
diff --git a/windows/winfw/src/winfw/winfw.cpp b/windows/winfw/src/winfw/winfw.cpp index 3065408f3d..7260de3e8b 100644 --- a/windows/winfw/src/winfw/winfw.cpp +++ b/windows/winfw/src/winfw/winfw.cpp @@ -11,8 +11,8 @@ namespace uint32_t g_timeout = 0; -WinFwErrorSink g_errorSink = nullptr; -void * g_errorContext = nullptr; +MullvadLogSink g_logSink = nullptr; +void *g_logSinkContext = nullptr; FwContext *g_fwContext = nullptr; @@ -51,8 +51,8 @@ bool WINFW_API WinFw_Initialize( uint32_t timeout, - WinFwErrorSink errorSink, - void *errorContext + MullvadLogSink logSink, + void *logSinkContext ) { if (nullptr != g_fwContext) @@ -67,8 +67,8 @@ WinFw_Initialize( // Convert seconds to milliseconds. g_timeout = timeout * 1000; - g_errorSink = errorSink; - g_errorContext = errorContext; + g_logSink = logSink; + g_logSinkContext = logSinkContext; try { @@ -76,9 +76,9 @@ WinFw_Initialize( } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; @@ -98,8 +98,8 @@ WINFW_API WinFw_InitializeBlocked( uint32_t timeout, const WinFwSettings &settings, - WinFwErrorSink errorSink, - void *errorContext + MullvadLogSink logSink, + void *logSinkContext ) { if (nullptr != g_fwContext) @@ -114,8 +114,8 @@ WinFw_InitializeBlocked( // Convert seconds to milliseconds. g_timeout = timeout * 1000; - g_errorSink = errorSink; - g_errorContext = errorContext; + g_logSink = logSink; + g_logSinkContext = logSinkContext; try { @@ -123,9 +123,9 @@ WinFw_InitializeBlocked( } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; @@ -174,9 +174,9 @@ WinFw_ApplyPolicyConnecting( } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; @@ -209,9 +209,9 @@ WinFw_ApplyPolicyConnected( } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; @@ -240,9 +240,9 @@ WinFw_ApplyPolicyBlocked( } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; @@ -269,9 +269,9 @@ WinFw_Reset() } catch (std::exception &err) { - if (nullptr != g_errorSink) + if (nullptr != g_logSink) { - g_errorSink(err.what(), g_errorContext); + g_logSink(MULLVAD_LOG_LEVEL_ERROR, err.what(), g_logSinkContext); } return false; diff --git a/windows/winfw/src/winfw/winfw.h b/windows/winfw/src/winfw/winfw.h index 6d43b0db4c..c95890dd4a 100644 --- a/windows/winfw/src/winfw/winfw.h +++ b/windows/winfw/src/winfw/winfw.h @@ -1,5 +1,7 @@ #pragma once -#include <cstdint> + +#include <libshared/logging/logsink.h> +#include <stdint.h> // // WINFW public API @@ -58,9 +60,6 @@ WinFwRelay; // transaction lock to become available. Specify 0 to use a default timeout // determined by Windows. // -// Optionally provide a callback if you are interested in logging exceptions. -// -typedef void (WINFW_API *WinFwErrorSink)(const char *errorMessage, void *context); extern "C" WINFW_LINKAGE @@ -68,8 +67,8 @@ bool WINFW_API WinFw_Initialize( uint32_t timeout, - WinFwErrorSink errorSink, - void *errorContext + MullvadLogSink logSink, + void *logSinkContext ); // @@ -89,8 +88,8 @@ WINFW_API WinFw_InitializeBlocked( uint32_t timeout, const WinFwSettings &settings, - WinFwErrorSink errorSink, - void *errorContext + MullvadLogSink logSink, + void *logSinkContext ); // diff --git a/windows/winfw/src/winfw/winfw.vcxproj b/windows/winfw/src/winfw/winfw.vcxproj index cbabe2f4f7..15da42ec0f 100644 --- a/windows/winfw/src/winfw/winfw.vcxproj +++ b/windows/winfw/src/winfw/winfw.vcxproj @@ -160,7 +160,7 @@ <PreprocessorDefinitions>WIN32;_DEBUG;WINFW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libshared\src\;$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -179,7 +179,7 @@ <PreprocessorDefinitions>_DEBUG;WINFW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libshared\src\;$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -200,7 +200,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;WINFW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libshared\src\;$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -223,7 +223,7 @@ <PreprocessorDefinitions>NDEBUG;WINFW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\libshared\src\;$(ProjectDir)..\;$(ProjectDir)..\..\..\windows-libraries\src\;$(ProjectDir)..\..\..\libwfp\src\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> |