projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.24.
[tinc]
/
src
/
mingw
/
device.c
diff --git
a/src/mingw/device.c
b/src/mingw/device.c
index
c0f5d29
..
235e0fd
100644
(file)
--- a/
src/mingw/device.c
+++ b/
src/mingw/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Windows tap driver in a MinGW environment
Copyright (C) 2002-2005 Ivo Timmermans,
/*
device.c -- Interaction with Windows tap driver in a MinGW environment
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2002-20
14
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
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
@@
-18,19
+18,20
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "system.h"
+#include "
../
system.h"
#include <windows.h>
#include <winioctl.h>
#include <windows.h>
#include <winioctl.h>
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
-#include "
mingw/
common.h"
+#include "common.h"
int device_fd = -1;
static HANDLE device_handle = INVALID_HANDLE_VALUE;
int device_fd = -1;
static HANDLE device_handle = INVALID_HANDLE_VALUE;
@@
-38,16
+39,17
@@
char *device = NULL;
char *iface = NULL;
static char *device_info = NULL;
char *iface = NULL;
static char *device_info = NULL;
-static
in
t device_total_in = 0;
-static
in
t device_total_out = 0;
+static
uint64_
t device_total_in = 0;
+static
uint64_
t device_total_out = 0;
extern char *myport;
static DWORD WINAPI tapreader(void *bla) {
int status;
extern char *myport;
static DWORD WINAPI tapreader(void *bla) {
int status;
-
long
len;
+
DWORD
len;
OVERLAPPED overlapped;
vpn_packet_t packet;
OVERLAPPED overlapped;
vpn_packet_t packet;
+ int errors = 0;
logger(LOG_DEBUG, "Tap reader running");
logger(LOG_DEBUG, "Tap reader running");
@@
-70,19
+72,30
@@
static DWORD WINAPI tapreader(void *bla) {
} else {
logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
} else {
logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
- return -1;
+ errors++;
+ if(errors >= 10) {
+ EnterCriticalSection(&mutex);
+ running = false;
+ LeaveCriticalSection(&mutex);
+ }
+ usleep(1000000);
+ continue;
}
}
}
}
-
EnterCriticalSection(&mutex)
;
+
errors = 0
;
packet.len = len;
packet.priority = 0;
packet.len = len;
packet.priority = 0;
+
+ EnterCriticalSection(&mutex);
route(myself, &packet);
LeaveCriticalSection(&mutex);
}
route(myself, &packet);
LeaveCriticalSection(&mutex);
}
+
+ return 0;
}
}
-bool setup_device(void) {
+
static
bool setup_device(void) {
HKEY key, key2;
int i;
HKEY key, key2;
int i;
@@
-90,22
+103,14
@@
bool setup_device(void) {
char adapterid[1024];
char adaptername[1024];
char tapname[1024];
char adapterid[1024];
char adaptername[1024];
char tapname[1024];
-
long
len;
+
DWORD
len;
unsigned long status;
bool found = false;
unsigned long status;
bool found = false;
- int
sock,
err;
+ int err;
HANDLE thread;
HANDLE thread;
- struct addrinfo *ai;
- struct addrinfo hint = {
- .ai_family = AF_UNSPEC,
- .ai_socktype = SOCK_STREAM,
- .ai_protocol = IPPROTO_TCP,
- .ai_flags = 0,
- };
-
get_config_string(lookup_config(config_tree, "Device"), &device);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "Device"), &device);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@
-129,7
+134,7
@@
bool setup_device(void) {
continue;
len = sizeof(adaptername);
continue;
len = sizeof(adaptername);
- err = RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
+ err = RegQueryValueEx(key2, "Name", 0, 0,
(LPBYTE)
adaptername, &len);
RegCloseKey(key2);
RegCloseKey(key2);
@@
-217,19
+222,19
@@
bool setup_device(void) {
return true;
}
return true;
}
-void close_device(void) {
+
static
void close_device(void) {
CloseHandle(device_handle);
free(device);
free(iface);
}
CloseHandle(device_handle);
free(device);
free(iface);
}
-bool read_packet(vpn_packet_t *packet) {
+
static
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
-bool write_packet(vpn_packet_t *packet) {
-
long
lenout;
+
static
bool write_packet(vpn_packet_t *packet) {
+
DWORD
lenout;
OVERLAPPED overlapped = {0};
ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
OVERLAPPED overlapped = {0};
ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
@@
-245,8
+250,16
@@
bool write_packet(vpn_packet_t *packet) {
return true;
}
return true;
}
-void dump_device_stats(void) {
+
static
void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
- logger(LOG_DEBUG, " total bytes in: %10
d"
, device_total_in);
- logger(LOG_DEBUG, " total bytes out: %10
d"
, device_total_out);
+ logger(LOG_DEBUG, " total bytes in: %10
"PRIu64
, device_total_in);
+ logger(LOG_DEBUG, " total bytes out: %10
"PRIu64
, device_total_out);
}
}
+
+const devops_t os_devops = {
+ .setup = setup_device,
+ .close = close_device,
+ .read = read_packet,
+ .write = write_packet,
+ .dump_stats = dump_device_stats,
+};