]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
dco-win: use run-time dynamic linking for GetOverlappedResultEx
authorLev Stipakov <lev@openvpn.net>
Sat, 20 Aug 2022 08:47:19 +0000 (11:47 +0300)
committerGert Doering <gert@greenie.muc.de>
Sat, 20 Aug 2022 09:29:35 +0000 (11:29 +0200)
This function is available starting from Windows 8. Calling it
"as is" causes startup error on Windows 7.

dco-win driver available on Windows 10 20H1 and newer. On older
systems installer will not show nor install the driver and dco-win code
won't be reached. It is safe to load GetOverlappedResultEx in runtime
and exit in case of error.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20220820084719.243-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25038.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
src/openvpn/dco_win.c

index 28bcccd4ea55ba71fc9974f53c7c60040d170014..a20308668910dab9e2f5e72443d485734b951be7 100644 (file)
@@ -107,6 +107,17 @@ dco_start_tun(struct tuntap *tt)
 static int
 dco_connect_wait(HANDLE handle, OVERLAPPED *ov, int timeout, volatile int *signal_received)
 {
+    /* GetOverlappedResultEx is available starting from Windows 8 */
+    typedef BOOL (*get_overlapped_result_ex_t) (HANDLE, LPOVERLAPPED, LPDWORD, DWORD, BOOL);
+    get_overlapped_result_ex_t get_overlapped_result_ex =
+        (get_overlapped_result_ex_t)GetProcAddress(GetModuleHandle("Kernel32.dll"),
+                                                   "GetOverlappedResultEx");
+
+    if (get_overlapped_result_ex == NULL)
+    {
+        msg(M_ERR, "Failed to load GetOverlappedResult()");
+    }
+
     DWORD timeout_msec = timeout * 1000;
     const int poll_interval_ms = 50;
 
@@ -115,7 +126,7 @@ dco_connect_wait(HANDLE handle, OVERLAPPED *ov, int timeout, volatile int *signa
         timeout_msec -= poll_interval_ms;
 
         DWORD transferred;
-        if (GetOverlappedResultEx(handle, ov, &transferred, poll_interval_ms, FALSE) != 0)
+        if (get_overlapped_result_ex(handle, ov, &transferred, poll_interval_ms, FALSE) != 0)
         {
             /* TCP connection established by dco */
             return 0;