Changeset 548

Timestamp:

10/28/10 21:05:23 (19 months ago)

Author:

eagle

Message:

Header files reordered according to inet(3).
Wincode updated, compiles and runs now on Windows 7 with OpenVPN 2.3 and Cygwin 1.7.

Location:

trunk/src

Files:

• ocat.h (modified) (4 diffs)
• ocat_wintuntap.c (modified) (4 diffs)

trunk/src/ocat.h

@@ -37 +37 @@
 #include <syslog.h>
 
-#include <arpa/inet.h>
 
 #include <sys/time.h>
@@ -44 +43 @@
 #include <sys/stat.h>
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -52 +54 @@
 #include <sys/endian.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -67 +66 @@
 #include <netinet/in_systm.h>
 #endif
+#include <arpa/inet.h>
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>

trunk/src/ocat_wintuntap.c

@@ -37 +37 @@
 // this registry directory contains also information about network drivers
 #define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-// I changed this from tap0801
-#define TAP_COMPONENT_ID "tap0901"
+const char *tap_component_id_[] = {"tap0901", "tapoas", "tap0801", NULL};
 
 #define USERMODEDEVICEDIR "\\\\.\\Global\\"
@@ -70 +69 @@
 
 
-int findTapDevice(char *deviceID, int deviceIDLen, char *deviceName, int deviceNameLen)
+int findTapDevice(char *deviceID, int deviceIDLen, char *deviceName, int deviceNameLen, const char *tap_component_id)
 {
    HKEY adapterKey, key;
@@ -97 +96 @@
       len = sizeof(componentId);
       if ((RegQueryValueEx(key, "ComponentId", NULL, NULL, componentId, &len) == ERROR_SUCCESS)
-            && !strcmp(componentId, TAP_COMPONENT_ID))
+            && !strcmp(componentId, tap_component_id))
       {
          len = deviceIDLen;
@@ -138 +137 @@
    TapData_t *tapData = &tapData_;
    unsigned long len = 0;
-   int status;
-    
-   if (findTapDevice(deviceId, sizeof(deviceId), deviceName, sizeof(deviceName)) == -1)
-   {
-      log_msg(LOG_ALERT, "could not find TAP driver with componentId \"%s\". Probly not installed",
-            TAP_COMPONENT_ID);
+   int status, i;
+
+   for (i = 0; tap_component_id_[i] != NULL; i++)
+      if ((status = findTapDevice(deviceId, sizeof(deviceId), deviceName, sizeof(deviceName), tap_component_id_[i])) != -1)
+         break;
+
+   if (status == -1)
+   {
+      log_msg(LOG_ALERT, "could not find TAP driver with valid componentId. Probly not installed");
       return -1;
    }