diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2021-11-29 20:51:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2021-11-29 20:51:58 +0100 |
| commit | 6e3e95a9da9458ddf0874b4bd1c8ce6b47fcef27 (patch) | |
| tree | 6e3667709d99f857d90b9831426f6a32ee70d113 /src/openvpnserv/service.h | |
| parent | b29f419d68b26b75a44e3ac00748875f1003b900 (diff) | |
| parent | f2b3dda12a731c2e0971cb7889728edaf23f6cb0 (diff) | |
Merge branch 'upstream' into develop
Diffstat (limited to 'src/openvpnserv/service.h')
| -rw-r--r-- | src/openvpnserv/service.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index 23b105f..500f390 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2013-2018 Heiko Hund <heiko.hund@sophos.com> + * Copyright (C) 2013-2021 Heiko Hund <heiko.hund@sophos.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -30,6 +30,7 @@ #include "config-msvc.h" #endif +#include <winsock2.h> #include <windows.h> #include <stdlib.h> #include <tchar.h> @@ -76,14 +77,18 @@ extern openvpn_service_t interactive_service; extern LPCTSTR service_instance; VOID WINAPI ServiceStartAutomaticOwn(DWORD argc, LPTSTR *argv); + VOID WINAPI ServiceStartAutomatic(DWORD argc, LPTSTR *argv); VOID WINAPI ServiceStartInteractiveOwn(DWORD argc, LPTSTR *argv); + VOID WINAPI ServiceStartInteractive(DWORD argc, LPTSTR *argv); -int openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist); +BOOL openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist); + +BOOL openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...); -int openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...); +BOOL openvpn_swprintf(wchar_t *const str, const size_t size, const wchar_t *const format, ...); DWORD GetOpenvpnSettings(settings_t *s); |