/*
device.c -- Interaction with Windows tap driver in a MinGW environment
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2014 Guus Sliepen <guus@tinc-vpn.org>
+ 2002-2018 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
extern char *myport;
static void device_issue_read() {
- device_read_overlapped.Offset = 0;
- device_read_overlapped.OffsetHigh = 0;
-
int status;
for(;;) {
+ ResetEvent(device_read_overlapped.hEvent);
+
DWORD len;
status = ReadFile(device_handle, (void *)device_read_packet.data, MTU, &len, &device_read_overlapped);
}
static void device_handle_read(void *data, int flags) {
- ResetEvent(device_read_overlapped.hEvent);
+ (void)data;
+ (void)flags;
DWORD len;
if(!GetOverlappedResult(device_handle, &device_read_overlapped, &len, FALSE)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error getting read result from %s %s: %s", device_info,
device, strerror(errno));
+
+ if(GetLastError() != ERROR_IO_INCOMPLETE) {
+ /* Must reset event or it will keep firing. */
+ ResetEvent(device_read_overlapped.hEvent);
+ }
+
return;
}
if(info[0] == 9 && info[1] >= 21)
logger(DEBUG_ALWAYS, LOG_WARNING,
"You are using the newer (>= 9.0.0.21, NDIS6) series of TAP-Win32 drivers. "
- "Using these drivers with tinc is not recommanded as it can result in poor performance. "
+ "Using these drivers with tinc is not recommended as it can result in poor performance. "
"You might want to revert back to 9.0.0.9 instead.");
}
}
}
static bool read_packet(vpn_packet_t *packet) {
+ (void)packet;
return false;
}
which according to MSDN is a no-no. */
if(!GetOverlappedResult(device_handle, &device_write_overlapped, &outlen, FALSE)) {
- int log_level = (GetLastError() == ERROR_IO_INCOMPLETE) ? DEBUG_TRAFFIC : DEBUG_ALWAYS;
- logger(log_level, LOG_ERR, "Error while checking previous write to %s %s: %s", device_info, device, winerror(GetLastError()));
- return false;
+ if(GetLastError() != ERROR_IO_INCOMPLETE) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error completing previously queued write to %s %s: %s", device_info, device, winerror(GetLastError()));
+ } else {
+ logger(DEBUG_TRAFFIC, LOG_ERR, "Previous overlapped write to %s %s still in progress", device_info, device);
+ // drop this packet
+ return true;
+ }
}
}
memcpy(&device_write_packet, packet, sizeof(*packet));
+ ResetEvent(device_write_overlapped.hEvent);
+
if(WriteFile(device_handle, DATA(&device_write_packet), device_write_packet.len, &outlen, &device_write_overlapped)) {
+ // Write was completed immediately.
device_write_packet.len = 0;
} else if(GetLastError() != ERROR_IO_PENDING) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info, device, winerror(GetLastError()));
+ device_write_packet.len = 0;
return false;
}