Better error handling in TCP connect

In some cases TCP connect may fail withing OvpnSocketTcpConnect(), before we queued IO request. This means that we don't have a way to notify userspace about failure and client should rely on client-side TCP connection timeout, which could be quite long. Fix by enqueueing IO request before initiating TCP connect and if connect fails, userspace got notified immediately. Signed-off-by: Lev Stipakov <[email protected]>
OpenVPN · Jun 16, 2022 · 677d217 · 677d217
1 parent 63e7d51
commit 677d217
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Driver.cpp b/Driver.cpp
@@ -231,9 +231,6 @@ OvpnEvtIoDeviceControl(WDFQUEUE queue, WDFREQUEST request, size_t outputBufferLe
 
     case OVPN_IOCTL_NEW_PEER:
         status = OvpnPeerNew(device, request);
-        if (status == STATUS_PENDING) {
-            LOG_IF_NOT_NT_SUCCESS(WdfRequestForwardToIoQueue(request, device->PendingNewPeerQueue));
-        }
         break;
 
     case OVPN_IOCTL_START_VPN:

diff --git a/peer.cpp b/peer.cpp
@@ -87,6 +87,7 @@ OvpnPeerNew(POVPN_DEVICE device, WDFREQUEST request)
     OvpnPeerZeroStats(&device->Stats);
 
     if (proto_tcp) {
+        LOG_IF_NOT_NT_SUCCESS(status = WdfRequestForwardToIoQueue(request, device->PendingNewPeerQueue));
         // start async connect
         status = OvpnSocketTcpConnect(socket, device, (PSOCKADDR)&peer->Remote);
     }