From 1be922591e729c743e83662e8ec5f786591ccc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Friedrich=20Scho=CC=88ller?= <hans@schoeller.se>
Date: Wed, 22 May 2013 02:38:52 +0200
Subject: [PATCH] Finishing up
---
src/tun_dev.h | 1 -
src/tun_dev_cygwin.c | 11 ++---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/tun_dev.h b/src/tun_dev.h
index a2910b0..f8c16b1 100644
--- a/src/tun_dev.h
+++ b/src/tun_dev.h
@@ -39,7 +39,6 @@ extern "C" {
int tun_close(int fd, char *dev);
int tun_write(int fd, char *buf, int len);
int tun_read(int fd, char *buf, int len);
-
const char *tun_last_error();
#ifdef WIN32
diff --git a/src/tun_dev_cygwin.c b/src/tun_dev_cygwin.c
index 9ff6330..86335ca 100644
--- a/src/tun_dev_cygwin.c
+++ b/src/tun_dev_cygwin.c
@@ -162,7 +162,7 @@ static HANDLE open_tap_adapter(char *name)
static __stdcall DWORD reader_thread(LPVOID ptr)
{
struct adapter_info *adapter_info = ptr;
- char buf[0xffff]; // TODO: MTU
+ char buf[0xffff]; // maximum IPv4 packet size
OVERLAPPED overlapped;
DWORD len;
int wait_result;
@@ -180,13 +180,7 @@ static __stdcall DWORD reader_thread(LPVOID ptr)
return 1;
}
- wait_result = WaitForSingleObjectEx(overlapped.hEvent, INFINITE, true); // or false?
-
- if (wait_result == WAIT_IO_COMPLETION)
- {
- printf("hui?\n");
- continue;
- }
+ wait_result = WaitForSingleObjectEx(overlapped.hEvent, INFINITE, false);
if (wait_result != WAIT_OBJECT_0)
{
@@ -201,7 +195,6 @@ static __stdcall DWORD reader_thread(LPVOID ptr)
}
}
- // printf("success: %d\n", len);
write(adapter_info->reader_write_fd, buf, len);
}
}