projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notices.
[tinc]
/
src
/
mingw
/
device.c
diff --git
a/src/mingw/device.c
b/src/mingw/device.c
index
2649914
..
6d916ba
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
/*
device.c -- Interaction with Windows tap driver in a MinGW environment
- Copyright (C) 2002-2005 Ivo Timmermans
<ivo@tinc-vpn.org>
,
- 2002-200
5
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2002-2005 Ivo Timmermans,
+ 2002-200
7
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
@@
-45,16
+45,23
@@
static int device_total_out = 0;
extern char *myport;
extern char *myport;
+static struct packetbuf {
+ uint8_t data[MTU];
+ length_t len;
+} *bufs;
+
+static int nbufs = 64;
+
DWORD WINAPI tapreader(void *bla) {
int sock, err, status;
struct addrinfo *ai;
struct addrinfo hint = {
.ai_family = AF_UNSPEC,
DWORD WINAPI tapreader(void *bla) {
int sock, err, status;
struct addrinfo *ai;
struct addrinfo hint = {
.ai_family = AF_UNSPEC,
- .ai_socktype = SOCK_
DGR
AM,
- .ai_protocol = IPPROTO_
UD
P,
+ .ai_socktype = SOCK_
STRE
AM,
+ .ai_protocol = IPPROTO_
TC
P,
.ai_flags = 0,
};
.ai_flags = 0,
};
-
char buf[MTU]
;
+
unsigned char bufno = 0
;
long len;
OVERLAPPED overlapped;
long len;
OVERLAPPED overlapped;
@@
-67,7
+74,7
@@
DWORD WINAPI tapreader(void *bla) {
return -1;
}
return -1;
}
- sock = socket(ai->ai_family,
ai->ai_socktype, ai->ai_protocol
);
+ sock = socket(ai->ai_family,
SOCK_STREAM, IPPROTO_TCP
);
freeaddrinfo(ai);
freeaddrinfo(ai);
@@
-92,7
+99,7
@@
DWORD WINAPI tapreader(void *bla) {
overlapped.OffsetHigh = 0;
ResetEvent(overlapped.hEvent);
overlapped.OffsetHigh = 0;
ResetEvent(overlapped.hEvent);
- status = ReadFile(device_handle, buf
, sizeof(buf)
, &len, &overlapped);
+ status = ReadFile(device_handle, buf
s[bufno].data, MTU
, &len, &overlapped);
if(!status) {
if(GetLastError() == ERROR_IO_PENDING) {
if(!status) {
if(GetLastError() == ERROR_IO_PENDING) {
@@
-106,8
+113,11
@@
DWORD WINAPI tapreader(void *bla) {
}
}
}
}
- if(send(sock, buf, len, 0) <= 0)
+ bufs[bufno].len = len;
+ if(send(sock, &bufno, 1, 0) <= 0)
return -1;
return -1;
+ if(++bufno >= nbufs)
+ bufno = 0;
}
}
}
}
@@
-131,8
+141,8
@@
bool setup_device(void)
struct addrinfo *ai;
struct addrinfo hint = {
.ai_family = AF_UNSPEC,
struct addrinfo *ai;
struct addrinfo hint = {
.ai_family = AF_UNSPEC,
- .ai_socktype = SOCK_
DGR
AM,
- .ai_protocol = IPPROTO_
UD
P,
+ .ai_socktype = SOCK_
STRE
AM,
+ .ai_protocol = IPPROTO_
TC
P,
.ai_flags = 0,
};
.ai_flags = 0,
};
@@
-228,6
+238,16
@@
bool setup_device(void)
overwrite_mac = 1;
}
overwrite_mac = 1;
}
+ /* Set up ringbuffer */
+
+ get_config_int(lookup_config(config_tree, "RingBufferSize"), &nbufs);
+ if(nbufs <= 1)
+ nbufs = 1;
+ else if(nbufs > 256)
+ nbufs = 256;
+
+ bufs = xmalloc_and_zero(nbufs * sizeof *bufs);
+
/* Create a listening socket */
err = getaddrinfo(NULL, myport, &hint, &ai);
/* Create a listening socket */
err = getaddrinfo(NULL, myport, &hint, &ai);
@@
-237,7
+257,7
@@
bool setup_device(void)
return false;
}
return false;
}
- sock = socket(ai->ai_family,
ai->ai_socktype, ai->ai_protocol
);
+ sock = socket(ai->ai_family,
SOCK_STREAM, IPPROTO_TCP
);
if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
@@
-295,17
+315,18
@@
void close_device(void)
bool read_packet(vpn_packet_t *packet)
{
bool read_packet(vpn_packet_t *packet)
{
-
int lenin
;
+
unsigned char bufno
;
cp();
cp();
- if((
lenin = recv(device_fd, packet->data, MTU
, 0)) <= 0) {
+ if((
recv(device_fd, &bufno, 1
, 0)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
- packet->len = lenin;
+ packet->len = bufs[bufno].len;
+ memcpy(packet->data, bufs[bufno].data, bufs[bufno].len);
device_total_in += packet->len;
device_total_in += packet->len;