diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-01-19 23:41:33 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-01-19 23:41:33 +0000 |
| commit | f5c4eed3978b57c82edacd0bb0724e6e6e089260 (patch) | |
| tree | 6dd5693a614b038b2a656dee7ba7ccd9e8bb572b /src/win32 | |
| parent | fixed silly bug at new tundevice (diff) | |
moved overlapped structs to class members (CreateEvent only once)
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/tunDevice.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/win32/tunDevice.cpp b/src/win32/tunDevice.cpp index 559d520..70aa4a4 100644 --- a/src/win32/tunDevice.cpp +++ b/src/win32/tunDevice.cpp @@ -43,6 +43,8 @@ TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifcfg_lp, std::string ifcfg_rnmp) : conf_(dev_name, dev_type, ifcfg_lp, ifcfg_rnmp, 1400) { handle_ = INVALID_HANDLE_VALUE; + roverlapped_.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + woverlapped_.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); HKEY key, key2; LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, NETWORK_CONNECTIONS_KEY, 0, KEY_READ, &key); @@ -112,6 +114,8 @@ TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifc TunDevice::~TunDevice() { CloseHandle(handle_); + CloseHandle(roverlapped_.hEvent); + CloseHandle(woverlapped_.hEvent); } int TunDevice::fix_return(int ret, size_t pi_length) @@ -123,17 +127,15 @@ int TunDevice::fix_return(int ret, size_t pi_length) int TunDevice::read(u_int8_t* buf, u_int32_t len) { DWORD lenout; - OVERLAPPED overlapped; - overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - overlapped.Offset = 0; - overlapped.OffsetHigh = 0; -// ResetEvent(overlapped.hEvent); + roverlapped_.Offset = 0; + roverlapped_.OffsetHigh = 0; + ResetEvent(roverlapped_.hEvent); - if(!ReadFile(handle_, buf, len, &lenout, &overlapped)) { + if(!ReadFile(handle_, buf, len, &lenout, &roverlapped_)) { DWORD err = GetLastError(); if(err == ERROR_IO_PENDING) { - WaitForSingleObject(overlapped.hEvent, INFINITE); - if(!GetOverlappedResult(handle_, &overlapped, &lenout, FALSE)) { + WaitForSingleObject(roverlapped_.hEvent, INFINITE); + if(!GetOverlappedResult(handle_, &roverlapped_, &lenout, FALSE)) { cLog.msg(Log::PRIO_ERR) << "Error while trying to get overlapped result: " << LogErrno(GetLastError()); return -1; } @@ -149,17 +151,15 @@ int TunDevice::read(u_int8_t* buf, u_int32_t len) int TunDevice::write(u_int8_t* buf, u_int32_t len) { DWORD lenout; - OVERLAPPED overlapped; - overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - overlapped.Offset = 0; - overlapped.OffsetHigh = 0; -// ResetEvent(overlapped.hEvent); + woverlapped_.Offset = 0; + woverlapped_.OffsetHigh = 0; + ResetEvent(woverlapped_.hEvent); - if(!WriteFile(handle_, buf, len, &lenout, &overlapped)) { + if(!WriteFile(handle_, buf, len, &lenout, &woverlapped_)) { DWORD err = GetLastError(); if(err == ERROR_IO_PENDING) { - WaitForSingleObject(overlapped.hEvent, INFINITE); - if(!GetOverlappedResult(handle_, &overlapped, &lenout, FALSE)) { + WaitForSingleObject(woverlapped_.hEvent, INFINITE); + if(!GetOverlappedResult(handle_, &woverlapped_, &lenout, FALSE)) { cLog.msg(Log::PRIO_ERR) << "Error while trying to get overlapped result: " << LogErrno(GetLastError()); return -1; } |