Changeset e59aaa

Timestamp:

06/14/09 21:50:35 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

8fc8ce

Parents:

f20b3c

git-author:

Erik Ekman <yarrick@…> (06/14/09 21:50:35)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:02)

Message:

Fixed #47, support any TAP device name

Files:

• CHANGELOG (modified) (1 diff)
• README-win32.txt (modified) (2 diffs)
• src/iodine.c (modified) (1 diff)
• src/tun.c (modified) (5 diffs)

CHANGELOG

@@ -8 +8 @@
 20xx-xx-xx: x.y.z
         - Fixed tunnel not working on Windows.
+        - Any device name is now supported on Windows, fixes #47.
 
 2009-06-01: 0.5.2 "WifiFree"

README-win32.txt

@@ -16 +16 @@
 2. Have one TAP32 interface installed
 
-3. Name the interface "dns"
+3. Make sure the interface does not have a default gateway set
 
-4. Make sure the interface does not have a default gateway set
-
-5. Run iodine/iodined as normal (see the main README file).
+4. Run iodine/iodined as normal (see the main README file).
    You may have to run it as administrator depending on user privileges.
 
-6. Enjoy!
+5. Enjoy!
 
 
@@ -51 +49 @@
 The following fixable limitations apply:
 - Exactly one TAP32 interface must be installed
-- The TAP32 interface must be named "dns" and be version 0801 or 0901
 - Server cannot read packet destination address
 

src/iodine.c

@@ -741 +741 @@
 
                 if(r > 0) {
-                        len = read(dns_fd, in, sizeof(in));
+                        /* recv() needed for windows, dont change to read() */
+                        len = recv(dns_fd, in, sizeof(in), 0);
                         if (len >= (17 + RAW_HDR_LEN)) {
                                 char hash[16];

src/tun.c

@@ -38 +38 @@
 
 #define TAP_ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
+#define NETWORK_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
 #define TAP_DEVICE_SPACE "\\\\.\\Global\\"
 #define TAP_VERSION_ID_0801 "tap0801"
@@ -54 +55 @@
 #include "common.h"
 
-char if_name[50];
+char if_name[250];
 
 #ifndef WINDOWS32
@@ -228 +229 @@
 }
 
+static void
+get_name(char *dev_name)
+{
+        char path[256];
+        char name_str[256] = "Name";
+        LONG status;
+        HKEY conn_key;
+        DWORD len;
+        DWORD datatype;
+
+        memset(if_name, 0, sizeof(if_name));
+
+        snprintf(path, sizeof(path), NETWORK_KEY "\\%s\\Connection", dev_name);
+        status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, path, 0, KEY_READ, &conn_key);
+        printf("%s ?? %s\n", path, dev_name);
+        if (status != ERROR_SUCCESS) {
+                fprintf(stderr, "Could not look up name of interface %s: error opening key\n", dev_name);
+                RegCloseKey(conn_key);
+                return;
+        }
+        len = sizeof(if_name);
+        status = RegQueryValueEx(conn_key, name_str, NULL, &datatype, (LPBYTE)if_name, &len);
+        if (status != ERROR_SUCCESS || datatype != REG_SZ) {
+                fprintf(stderr, "Could not look up name of interface %s: error reading value\n", dev_name);
+                RegCloseKey(conn_key);
+                return;
+        }
+        RegCloseKey(conn_key);
+}
+
 DWORD WINAPI tun_reader(LPVOID arg)
 {
@@ -266 +297 @@
         memset(adapter, 0, sizeof(adapter));
         get_device(adapter, sizeof(adapter));
-
-        if (strlen(adapter) == 0) {
+        get_name(adapter); /* Copies interface 'human name' to if_name */
+
+        if (strlen(adapter) == 0 || strlen(if_name) == 0) {
                 warnx("No TAP adapters found. See README-win32.txt for help.\n");
                 return -1;
@@ -278 +310 @@
                 return -1;
         }
-
-        /* TODO get name of interface */
-        strncpy(if_name, "dns", MIN(4, sizeof(if_name)));
 
         /* Use a UDP connection to forward packets from tun,