Changeset 484 for branches/win/trunk/src/ocat_wintuntap.c

Timestamp:

02/28/09 23:49:41 (3 years ago)

Author:

eagle

Message:

seems to work on WinXP now :)

File:

• branches/win/trunk/src/ocat_wintuntap.c (modified) (5 diffs)

branches/win/trunk/src/ocat_wintuntap.c

@@ -135 +135 @@
 int win_open_tun(char *dev, int s)
 {
-   char deviceId[256], deviceName[256], tapPath[256];
+   char deviceId[SIZE_256], deviceName[SIZE_256], tapPath[SIZE_256];
    TapData_t *tapData = &tapData_;
    unsigned long len = 0;
@@ -183 +183 @@
    // % netsh interface ipv6 add route  fd87:d87e:eb43::/48 "LAN-Verbindung 2"
 
-   strlcpy(dev, deviceId, s);
+   strlcpy(dev, deviceName, s);
    return 0;
 }
@@ -202 +202 @@
 int win_write_tun(const char *jb, int len)
 {
-    TapData_t *tapData = &tapData_;
-    DWORD written, err;
-    BOOL result;
-    
-    result = GetOverlappedResult(tapData->fd, &tapData->write_overlapped,
-                                  &written, FALSE);
-
-    if (!result && GetLastError() == ERROR_IO_INCOMPLETE)
-        WaitForSingleObject(tapData->write_event, INFINITE);
-
-    if (!WriteFile(tapData->fd, jb, len, &written, &tapData->write_overlapped))
-    {
+   TapData_t *tapData = &tapData_;
+   DWORD written, err;
+    
+   log_debug("WriteFile %d bytes", len);
+   if (!GetOverlappedResult(tapData->fd, &tapData->write_overlapped, &written, FALSE))
+   {
+      err = GetLastError();
+      log_debug("GetOverlappedResult failed. Error = %ld", err);
+      if (err == ERROR_IO_INCOMPLETE)
+      {
+         log_debug("IO_COMPLETE, WaitForSingleObject");
+         if ((err = WaitForSingleObject(tapData->write_event, INFINITE)) == WAIT_FAILED)
+            log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
+         else
+            log_debug("WaitForSingleObject returen %08lx", err);
+      }
+   }
+
+   if (!WriteFile(tapData->fd, jb, len, &written, &tapData->write_overlapped))
+   {
       if ((err = GetLastError()) != ERROR_IO_PENDING)
       {   
-       fprintf(stderr, "error writing %ld \n", err);
-       return -1;
+         log_msg(LOG_ERR, "error writing %ld", err);
+         return -1;
       }
       else
-         fprintf(stderr, "io pending\n");
-    }
-
-    return written;
-    
+         log_debug("IO_PENDING");
+   }
+
+   return written;
 }
 
@@ -234 +241 @@
    DWORD len, err;
     
-   log_debug("ReadFile");
+   log_debug("ReadFile max. %d bytes", n);
    if (!ReadFile(tapData->fd, buf, n, &len, &tapData->read_overlapped))
    {
@@ -240 +247 @@
       if ((err = GetLastError()) == ERROR_IO_PENDING)
       {
-         log_debug("ReadFile pending...");
-
-         if ((err = WaitForSingleObject(tapData->read_event, INFINITE)) == WAIT_FAILED)
-            log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
-         else
-            log_debug("WaitForSingleObject returen %08lx", err);
+         for (err = WAIT_TIMEOUT; err == WAIT_TIMEOUT;)
+         {
+            log_debug("ReadFile pending...");
+            if ((err = WaitForSingleObject(tapData->read_event, SELECT_TIMEOUT * 1000)) == WAIT_FAILED)
+               log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
+            log_debug("WaitForSingleObject returned %08lx", err);
+         }
 
          if (!GetOverlappedResult(tapData->fd, &tapData->read_overlapped, &len, FALSE))